Skip to content

Commit

Permalink
isci: Removed sci_base_object from scic_sds_remote_device.
Browse files Browse the repository at this point in the history 
The 'struct sci_base_object' was removed from the struct
scic_sds_remote_device.

Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
[cleaned up sci_dev_to_idev]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Maciej Patelczyk authored and Dan Williams committed Jul 3, 2011
1 parent 115bd1f commit 5d937e9
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 59 deletions.
47 changes: 19 additions & 28 deletions drivers/scsi/isci/remote_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1101,9 +1101,8 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_

static void scic_sds_remote_device_initial_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = (struct scic_sds_remote_device *)object;
struct scic_sds_remote_device *sci_dev = object;

sci_dev = container_of(object, typeof(*sci_dev), parent);
SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
SCI_BASE_REMOTE_DEVICE_STATE_INITIAL);

Expand Down Expand Up @@ -1203,16 +1202,15 @@ static void isci_remote_device_stop_complete(struct isci_host *ihost,

static void scic_sds_remote_device_stopped_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev;
struct scic_sds_remote_device *sci_dev = object;
struct scic_sds_controller *scic;
struct isci_remote_device *idev;
struct isci_host *ihost;
u32 prev_state;

sci_dev = container_of(object, typeof(*sci_dev), parent);
scic = scic_sds_remote_device_get_controller(sci_dev);
ihost = scic->ihost;
idev = sci_object_get_association(sci_dev);
idev = sci_dev_to_idev(sci_dev);

SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
SCI_BASE_REMOTE_DEVICE_STATE_STOPPED);
Expand All @@ -1229,11 +1227,10 @@ static void scic_sds_remote_device_stopped_state_enter(void *object)

static void scic_sds_remote_device_starting_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);

SET_STATE_HANDLER(sci_dev, scic_sds_remote_device_state_handler_table,
SCI_BASE_REMOTE_DEVICE_STATE_STARTING);
Expand All @@ -1244,11 +1241,10 @@ static void scic_sds_remote_device_starting_state_enter(void *object)

static void scic_sds_remote_device_ready_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);

SET_STATE_HANDLER(sci_dev,
scic_sds_remote_device_state_handler_table,
Expand All @@ -1264,14 +1260,13 @@ static void scic_sds_remote_device_ready_state_enter(void *object)

static void scic_sds_remote_device_ready_state_exit(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
if (sci_dev->has_ready_substate_machine)
sci_base_state_machine_stop(&sci_dev->ready_substate_machine);
else {
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);

isci_remote_device_not_ready(ihost, idev,
SCIC_REMOTE_DEVICE_NOT_READY_STOP_REQUESTED);
Expand All @@ -1280,7 +1275,7 @@ static void scic_sds_remote_device_ready_state_exit(void *object)

static void scic_sds_remote_device_stopping_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = (struct scic_sds_remote_device *)object;
struct scic_sds_remote_device *sci_dev = object;

SET_STATE_HANDLER(
sci_dev,
Expand All @@ -1291,7 +1286,7 @@ static void scic_sds_remote_device_stopping_state_enter(void *object)

static void scic_sds_remote_device_failed_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = (struct scic_sds_remote_device *)object;
struct scic_sds_remote_device *sci_dev = object;

SET_STATE_HANDLER(
sci_dev,
Expand All @@ -1302,7 +1297,7 @@ static void scic_sds_remote_device_failed_state_enter(void *object)

static void scic_sds_remote_device_resetting_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = (struct scic_sds_remote_device *)object;
struct scic_sds_remote_device *sci_dev = object;

SET_STATE_HANDLER(
sci_dev,
Expand All @@ -1316,14 +1311,14 @@ static void scic_sds_remote_device_resetting_state_enter(void *object)

static void scic_sds_remote_device_resetting_state_exit(void *object)
{
struct scic_sds_remote_device *sci_dev = (struct scic_sds_remote_device *)object;
struct scic_sds_remote_device *sci_dev = object;

scic_sds_remote_node_context_resume(&sci_dev->rnc, NULL, NULL);
}

static void scic_sds_remote_device_final_state_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = (struct scic_sds_remote_device *)object;
struct scic_sds_remote_device *sci_dev = object;

SET_STATE_HANDLER(
sci_dev,
Expand Down Expand Up @@ -1377,11 +1372,10 @@ static void scic_remote_device_construct(struct scic_sds_port *sci_port,
{
sci_dev->owning_port = sci_port;
sci_dev->started_request_count = 0;
sci_dev->parent.private = NULL;

sci_base_state_machine_construct(
&sci_dev->state_machine,
&sci_dev->parent,
sci_dev,
scic_sds_remote_device_state_table,
SCI_BASE_REMOTE_DEVICE_STATE_INITIAL
);
Expand Down Expand Up @@ -1440,7 +1434,7 @@ static enum sci_status scic_remote_device_da_construct(struct scic_sds_port *sci

sci_base_state_machine_construct(
&sci_dev->ready_substate_machine,
&sci_dev->parent,
sci_dev,
scic_sds_stp_remote_device_ready_substate_table,
SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
} else if (dev_is_expander(dev)) {
Expand All @@ -1449,7 +1443,7 @@ static enum sci_status scic_remote_device_da_construct(struct scic_sds_port *sci
/* add the SMP ready substate machine construction here */
sci_base_state_machine_construct(
&sci_dev->ready_substate_machine,
&sci_dev->parent,
sci_dev,
scic_sds_smp_remote_device_ready_substate_table,
SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
} else
Expand Down Expand Up @@ -1497,15 +1491,15 @@ static enum sci_status scic_remote_device_ea_construct(struct scic_sds_port *sci
/* add the SMP ready substate machine construction here */
sci_base_state_machine_construct(
&sci_dev->ready_substate_machine,
&sci_dev->parent,
sci_dev,
scic_sds_smp_remote_device_ready_substate_table,
SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
} else if (dev->dev_type == SATA_DEV || (dev->tproto & SAS_PROTOCOL_STP)) {
sci_dev->has_ready_substate_machine = true;

sci_base_state_machine_construct(
&sci_dev->ready_substate_machine,
&sci_dev->parent,
sci_dev,
scic_sds_stp_remote_device_ready_substate_table,
SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE);
}
Expand Down Expand Up @@ -1565,9 +1559,6 @@ static enum sci_status isci_remote_device_construct(struct isci_port *iport,
return status;
}

/* XXX will be killed with sci_base_object removal */
sci_object_set_association(&idev->sci, idev);

/* start the device. */
status = scic_remote_device_start(&idev->sci, ISCI_REMOTE_DEVICE_START_TIMEOUT);

Expand Down
15 changes: 7 additions & 8 deletions drivers/scsi/isci/remote_device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ enum scic_remote_device_not_ready_reason_code {
};

struct scic_sds_remote_device {
/**
* The field specifies that the parent object for the base remote
* device is the base object itself.
*/
struct sci_base_object parent;

/**
* This field contains the information for the base remote device state
* machine.
Expand Down Expand Up @@ -417,11 +411,16 @@ static inline struct scic_sds_remote_device *rnc_to_dev(struct scic_sds_remote_n
return sci_dev;
}

static inline struct domain_device *sci_dev_to_domain(struct scic_sds_remote_device *sci_dev)
static inline struct isci_remote_device *sci_dev_to_idev(struct scic_sds_remote_device *sci_dev)
{
struct isci_remote_device *idev = container_of(sci_dev, typeof(*idev), sci);

return idev->domain_dev;
return idev;
}

static inline struct domain_device *sci_dev_to_domain(struct scic_sds_remote_device *sci_dev)
{
return sci_dev_to_idev(sci_dev)->domain_dev;
}

static inline bool dev_is_expander(struct domain_device *dev)
Expand Down
7 changes: 4 additions & 3 deletions drivers/scsi/isci/sci_environment.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
#include "isci.h"
#include "core/scic_sds_controller.h"

struct scic_sds_remote_device;

static inline struct device *scic_to_dev(struct scic_sds_controller *scic)
{
Expand Down Expand Up @@ -88,9 +87,11 @@ static inline struct device *sciport_to_dev(struct scic_sds_port *sci_port)
return &iport->isci_host->pdev->dev;
}

static inline struct device *scirdev_to_dev(struct scic_sds_remote_device *sci_dev)
static inline struct device *scirdev_to_dev(
struct scic_sds_remote_device *sci_dev)
{
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev =
container_of(sci_dev, typeof(*idev), sci);

if (!idev || !idev->isci_port || !idev->isci_port->isci_host)
return NULL;
Expand Down
13 changes: 5 additions & 8 deletions drivers/scsi/isci/smp_remote_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,10 @@ static const struct scic_sds_remote_device_state_handler scic_sds_smp_remote_dev
*/
static void scic_sds_smp_remote_device_ready_idle_substate_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);

SET_STATE_HANDLER(sci_dev,
scic_sds_smp_remote_device_ready_substate_handler_table,
Expand All @@ -270,11 +269,10 @@ static void scic_sds_smp_remote_device_ready_idle_substate_enter(void *object)
*/
static void scic_sds_smp_remote_device_ready_cmd_substate_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);

BUG_ON(sci_dev->working_request == NULL);

Expand All @@ -295,8 +293,7 @@ static void scic_sds_smp_remote_device_ready_cmd_substate_enter(void *object)
*/
static void scic_sds_smp_remote_device_ready_cmd_substate_exit(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
sci_dev->working_request = NULL;
}

Expand Down
19 changes: 7 additions & 12 deletions drivers/scsi/isci/stp_remote_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ static void
scic_sds_stp_remote_device_ready_idle_substate_resume_complete_handler(void *user_cookie)
{
struct scic_sds_remote_device *sci_dev = user_cookie;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;

Expand All @@ -607,9 +607,7 @@ scic_sds_stp_remote_device_ready_idle_substate_resume_complete_handler(void *use
*/
static void scic_sds_stp_remote_device_ready_idle_substate_enter(void *device)
{
struct scic_sds_remote_device *sci_dev;

sci_dev = (struct scic_sds_remote_device *)device;
struct scic_sds_remote_device *sci_dev = device;

SET_STATE_HANDLER(
sci_dev,
Expand All @@ -636,11 +634,10 @@ static void scic_sds_stp_remote_device_ready_idle_substate_enter(void *device)

static void scic_sds_stp_remote_device_ready_cmd_substate_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);

BUG_ON(sci_dev->working_request == NULL);

Expand All @@ -654,8 +651,7 @@ static void scic_sds_stp_remote_device_ready_cmd_substate_enter(void *object)

static void scic_sds_stp_remote_device_ready_ncq_substate_enter(void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
SET_STATE_HANDLER(sci_dev,
scic_sds_stp_remote_device_ready_substate_handler_table,
SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ);
Expand All @@ -664,11 +660,10 @@ static void scic_sds_stp_remote_device_ready_ncq_substate_enter(void *object)
static void scic_sds_stp_remote_device_ready_ncq_error_substate_enter(
void *object)
{
struct scic_sds_remote_device *sci_dev = container_of(object, typeof(*sci_dev),
parent);
struct scic_sds_remote_device *sci_dev = object;
struct scic_sds_controller *scic = scic_sds_remote_device_get_controller(sci_dev);
struct isci_host *ihost = scic->ihost;
struct isci_remote_device *idev = sci_object_get_association(sci_dev);
struct isci_remote_device *idev = sci_dev_to_idev(sci_dev);

SET_STATE_HANDLER(sci_dev,
scic_sds_stp_remote_device_ready_substate_handler_table,
Expand Down

0 comments on commit 5d937e9

Please sign in to comment.