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>
This commit is contained in:
Dan Williams
2011-06-30 17:38:32 -07:00
parent 78a6f06e0e
commit d9dcb4ba79
16 changed files with 806 additions and 985 deletions

View File

@@ -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,