summaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/sci_environment.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-05-07 00:36:38 (GMT)
committerDan Williams <dan.j.williams@intel.com>2011-07-03 11:04:47 (GMT)
commit4b33981ade7cf723f3f32809e34192376c9a10f8 (patch)
tree576eda3b06d27e9911203bfbf2e5818ce63cac08 /drivers/scsi/isci/sci_environment.h
parenta98a7426bc91700ac8613701daf8470efe2ad2d2 (diff)
downloadlinux-fsl-qoriq-4b33981ade7cf723f3f32809e34192376c9a10f8.tar.xz
isci: unify phy data structures
Make scic_sds_phy a member of isci_phy and merge their lifetimes which means removing the phy table from scic_sds_controller in favor of the one at that isci_host level. Reported-by: Christoph Hellwig <hch@lst.de> 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/sci_environment.h b/drivers/scsi/isci/sci_environment.h
index 8394f60..bb07ed3 100644
--- a/drivers/scsi/isci/sci_environment.h
+++ b/drivers/scsi/isci/sci_environment.h
@@ -67,7 +67,7 @@ static inline struct device *scic_to_dev(struct scic_sds_controller *scic)
static inline struct device *sciphy_to_dev(struct scic_sds_phy *sci_phy)
{
- struct isci_phy *iphy = sci_phy->iphy;
+ struct isci_phy *iphy = sci_phy_to_iphy(sci_phy);
if (!iphy || !iphy->isci_port || !iphy->isci_port->isci_host)
return NULL;