summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/sci_environment.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/isci/sci_environment.h')
-rw-r--r--drivers/scsi/isci/sci_environment.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/isci/sci_environment.h b/drivers/scsi/isci/sci_environment.h
index 3fb54ddaee1a..41636c34da9e 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;