diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-05-07 17:11:43 (GMT) |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 11:04:47 (GMT) |
commit | e531381e2f8a68b8737c63c7bb890ad80b2470bd (patch) | |
tree | b3f4deb3286269fa62e5c2ff94338dab4743f2c9 /drivers/scsi/isci/host.c | |
parent | 4b33981ade7cf723f3f32809e34192376c9a10f8 (diff) | |
download | linux-fsl-qoriq-e531381e2f8a68b8737c63c7bb890ad80b2470bd.tar.xz |
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/host.c')
-rw-r--r-- | drivers/scsi/isci/host.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index d180ad8..cdd99304 100644 --- a/drivers/scsi/isci/host.c +++ b/drivers/scsi/isci/host.c @@ -277,10 +277,10 @@ void isci_host_deinit(struct isci_host *ihost) isci_host_change_state(ihost, isci_stopping); for (i = 0; i < SCI_MAX_PORTS; i++) { - struct isci_port *port = &ihost->isci_ports[i]; + struct isci_port *iport = &ihost->ports[i]; struct isci_remote_device *idev, *d; - list_for_each_entry_safe(idev, d, &port->remote_dev_list, node) { + list_for_each_entry_safe(idev, d, &iport->remote_dev_list, node) { isci_remote_device_change_state(idev, isci_stopping); isci_remote_device_stop(ihost, idev); } @@ -442,7 +442,7 @@ int isci_host_init(struct isci_host *isci_host) return -ENOMEM; for (i = 0; i < SCI_MAX_PORTS; i++) - isci_port_init(&isci_host->isci_ports[i], isci_host, i); + isci_port_init(&isci_host->ports[i], isci_host, i); for (i = 0; i < SCI_MAX_PHYS; i++) isci_phy_init(&isci_host->phys[i], isci_host, i); |