diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-06-30 17:38:32 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 04:04:52 -0700 |
| commit | d9dcb4ba791de2a06b19ac47cd61601cf3d4e208 (patch) | |
| tree | 4b818b5b14c078703c034489c92e74975be6c06f /drivers/scsi/isci/port.h | |
| parent | 78a6f06e0e82125787d7aa308fe28c2c8381540c (diff) | |
| download | blackbird-op-linux-d9dcb4ba791de2a06b19ac47cd61601cf3d4e208.tar.gz blackbird-op-linux-d9dcb4ba791de2a06b19ac47cd61601cf3d4e208.zip | |
isci: unify isci_host and scic_sds_controller
Remove the distinction between these two implementations and unify on
isci_host (local instances named ihost). Hmmm, we had two
'oem_parameters' instances, one was unused... nice.
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/port.h')
| -rw-r--r-- | drivers/scsi/isci/port.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h index b9bc89bf6519..9a9be7b47b4a 100644 --- a/drivers/scsi/isci/port.h +++ b/drivers/scsi/isci/port.h @@ -115,7 +115,7 @@ struct isci_port { u32 assigned_device_count; u32 not_ready_reason; struct isci_phy *phy_table[SCI_MAX_PHYS]; - struct scic_sds_controller *owning_controller; + struct isci_host *owning_controller; struct sci_timer timer; struct scu_port_task_scheduler_registers __iomem *port_task_scheduler_registers; /* XXX rework: only one register, no need to replicate per-port */ @@ -243,7 +243,7 @@ static inline void scic_sds_port_decrement_request_count(struct isci_port *iport void scic_sds_port_construct( struct isci_port *iport, u8 port_index, - struct scic_sds_controller *scic); + struct isci_host *ihost); enum sci_status scic_sds_port_initialize( struct isci_port *iport, |
