summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/host.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-04-21 18:14:45 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:00:38 -0700
commit57f20f4ed6fb702339be2ef4dea9d15e6a7d0d07 (patch)
treed31db747f233d5ea790e82b64e233ee762cf2cdf /drivers/scsi/isci/host.h
parent9614395ea2eed076fa8341df422582b0017d330c (diff)
downloadblackbird-op-linux-57f20f4ed6fb702339be2ef4dea9d15e6a7d0d07.tar.gz
blackbird-op-linux-57f20f4ed6fb702339be2ef4dea9d15e6a7d0d07.zip
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>
Diffstat (limited to 'drivers/scsi/isci/host.h')
-rw-r--r--drivers/scsi/isci/host.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 6e660744d8d4..21bd7d88e5d8 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -110,18 +110,9 @@ struct isci_host {
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
OpenPOWER on IntegriCloud