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/task.c b/drivers/scsi/isci/task.c
index 3a3f546..cabad0b 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -299,7 +299,7 @@
/* let the core do it's construct. */
status = scic_task_request_construct(
- isci_host->core_controller,
+ &isci_host->sci,
sci_device,
SCI_CONTROLLER_INVALID_IO_TAG,
request,
@@ -378,7 +378,7 @@
/* Terminate the TMF transmit request. */
status = scic_controller_terminate_request(
- request->isci_host->core_controller,
+ &request->isci_host->sci,
&request->isci_device->sci,
request->sci_request_handle
);
@@ -469,7 +469,7 @@
/* start the TMF io. */
status = scic_controller_start_task(
- isci_host->core_controller,
+ &isci_host->sci,
sci_device,
request->sci_request_handle,
SCI_CONTROLLER_INVALID_IO_TAG
@@ -772,7 +772,7 @@
was_terminated = true;
needs_cleanup_handling = true;
status = scic_controller_terminate_request(
- isci_host->core_controller,
+ &isci_host->sci,
&isci_device->sci,
isci_request->sci_request_handle);
}
@@ -1466,12 +1466,9 @@
/* PRINT_TMF( ((struct isci_tmf *)request->task)); */
tmf_complete = tmf->complete;
- scic_controller_complete_io(ihost->core_controller,
- &idev->sci,
+ scic_controller_complete_io(&ihost->sci, &idev->sci,
ireq->sci_request_handle);
-
- /*
- * NULL the request handle to make sure it cannot be terminated
+ /* NULL the request handle to make sure it cannot be terminated
* or completed again.
*/
ireq->sci_request_handle = NULL;