aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/init.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-05-07 10:11:43 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:47 -0700
commite531381e2f8a68b8737c63c7bb890ad80b2470bd (patch)
treeb3f4deb3286269fa62e5c2ff94338dab4743f2c9 /drivers/scsi/isci/init.c
parent4b33981ade7cf723f3f32809e34192376c9a10f8 (diff)
downloadkernel_samsung_crespo-e531381e2f8a68b8737c63c7bb890ad80b2470bd.zip
kernel_samsung_crespo-e531381e2f8a68b8737c63c7bb890ad80b2470bd.tar.gz
kernel_samsung_crespo-e531381e2f8a68b8737c63c7bb890ad80b2470bd.tar.bz2
isci: unify port data structures
Make scic_sds_port a member of isci_port and merge their lifetimes which means removing the port table from scic_sds_controller in favor of the one at the isci_host level. Merge ihost->sas_ports into ihost->ports. _ Reported-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/init.c')
-rw-r--r--drivers/scsi/isci/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index a5d5c0b..522d39f 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -221,8 +221,8 @@ static int isci_register_sas_ha(struct isci_host *isci_host)
/* set the array of phy and port structs. */
for (i = 0; i < SCI_MAX_PHYS; i++) {
- sas_phys[i] = &(isci_host->phys[i].sas_phy);
- sas_ports[i] = &(isci_host->sas_ports[i]);
+ sas_phys[i] = &isci_host->phys[i].sas_phy;
+ sas_ports[i] = &isci_host->ports[i].sas_port;
}
sas_ha->sas_phy = sas_phys;