isci: unify isci_host data structures
Make it explicit that isci_host and scic_sds_controller are one in the same
object.
Signed-off-by: Artur Wojcik <artur.wojcik@intel.com>
[removed ->ihost back pointer]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 8dc8d1c..00e4854 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -58,7 +58,7 @@
#define _SCI_HOST_H_
#include "phy.h"
-/*#include "task.h"*/
+#include "scic_sds_controller.h"
#include "timers.h"
#include "remote_device.h"
@@ -75,7 +75,7 @@
#define SCIC_CONTROLLER_STOP_TIMEOUT 5000
struct isci_host {
- struct scic_sds_controller *core_controller;
+ struct scic_sds_controller sci;
union scic_oem_parameters oem_parameters;
int id; /* unique within a given pci device */
@@ -219,6 +219,14 @@
return dev->port->ha->lldd_ha;
}
+static inline struct isci_host *scic_to_ihost(struct scic_sds_controller *scic)
+{
+ /* XXX delete after merging scic_sds_contoller and isci_host */
+ struct isci_host *ihost = container_of(scic, typeof(*ihost), sci);
+
+ return ihost;
+}
+
/**
* isci_host_scan_finished() -
*