diff options
| author | Maciej Patelczyk <maciej.patelczyk@intel.com> | 2011-04-28 22:06:21 +0000 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 04:00:38 -0700 |
| commit | 5d937e966d383c4012c19b0e47dc196ba505eb19 (patch) | |
| tree | 54639bdc00f70d2e0af9f424e2b4a87a4cd99725 /drivers/scsi/isci/remote_device.h | |
| parent | 115bd1f9e8ee11744818e6eb5351d05ab6a8402e (diff) | |
isci: Removed sci_base_object from scic_sds_remote_device.
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>
Diffstat (limited to 'drivers/scsi/isci/remote_device.h')
| -rw-r--r-- | drivers/scsi/isci/remote_device.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h index 5cceb6c5dc1d..62623c766388 100644 --- a/drivers/scsi/isci/remote_device.h +++ b/drivers/scsi/isci/remote_device.h @@ -75,12 +75,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. */ @@ -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) |