diff options
| author | Maciej Patelczyk <maciej.patelczyk@intel.com> | 2011-04-28 22:06:21 (GMT) |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 11:00:38 (GMT) |
| commit | 5d937e966d383c4012c19b0e47dc196ba505eb19 (patch) | |
| tree | 54639bdc00f70d2e0af9f424e2b4a87a4cd99725 /drivers/scsi/isci/sci_environment.h | |
| parent | 115bd1f9e8ee11744818e6eb5351d05ab6a8402e (diff) | |
| download | linux-fsl-qoriq-5d937e966d383c4012c19b0e47dc196ba505eb19.tar.xz | |
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/sci_environment.h')
| -rw-r--r-- | drivers/scsi/isci/sci_environment.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/isci/sci_environment.h b/drivers/scsi/isci/sci_environment.h index 3fb54dd..41636c3 100644 --- a/drivers/scsi/isci/sci_environment.h +++ b/drivers/scsi/isci/sci_environment.h @@ -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) { @@ -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; |