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>
diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h
index 5cceb6c..62623c7 100644
--- a/drivers/scsi/isci/remote_device.h
+++ b/drivers/scsi/isci/remote_device.h
@@ -75,12 +75,6 @@
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 @@
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)