isci: unify remote_device data structures
Make it explicit that isci_remote_device and scic_sds_remote_device are
one in the same object.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 6e66074..21bd7d8 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -110,18 +110,9 @@
struct list_head requests_to_errorback;
spinlock_t scic_lock;
- /* careful only access this via idev_by_id */
- struct isci_remote_device devices[0];
+ struct isci_remote_device devices[SCI_MAX_REMOTE_DEVICES];
};
-static inline struct isci_remote_device *idev_by_id(struct isci_host *ihost, int i)
-{
- void *p = ihost->devices;
-
- return p + i * (sizeof(struct isci_remote_device) +
- scic_remote_device_get_object_size());
-}
-
/**
* struct isci_pci_info - This class represents the pci function containing the
* controllers. Depending on PCI SKU, there could be up to 2 controllers in