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>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 00e4854e20d9..5a414c31a877 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -84,12 +84,7 @@ struct isci_host {
         struct dma_pool *dma_pool;
         unsigned int dma_pool_alloc_size;
         struct isci_phy phys[SCI_MAX_PHYS];
-
-        /* isci_ports and sas_ports are implicitly parallel to the
-         * ports maintained by the core
-         */
-        struct isci_port isci_ports[SCI_MAX_PORTS];
-        struct asd_sas_port sas_ports[SCI_MAX_PORTS];
+        struct isci_port ports[SCI_MAX_PORTS + 1]; /* includes dummy port */
         struct sas_ha_struct sas_ha;
 
         int can_queue;