diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-05-07 19:11:43 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 13:04:47 +0200 |
| commit | e531381e2f8a68b8737c63c7bb890ad80b2470bd (patch) | |
| tree | b3f4deb3286269fa62e5c2ff94338dab4743f2c9 /drivers/scsi/isci/host.h | |
| parent | isci: unify phy data structures (diff) | |
| download | linux-e531381e2f8a68b8737c63c7bb890ad80b2470bd.tar.xz linux-e531381e2f8a68b8737c63c7bb890ad80b2470bd.zip | |
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.h')
| -rw-r--r-- | drivers/scsi/isci/host.h | 7 |
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; |