summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/request.c
diff options
context:
space:
mode:
authorArtur Wojcik2011-05-04 09:58:16 +0200
committerDan Williams2011-07-03 13:04:46 +0200
commitcc3dbd0a9178865d4444f8e28b51715808e9ac85 (patch)
tree4f8da28b4740e0ddaeb3163a3d317f36bc49571c /drivers/scsi/isci/request.c
parentisci: implement I_T_nexus_reset (diff)
downloadkernel-qcow2-linux-cc3dbd0a9178865d4444f8e28b51715808e9ac85.tar.gz
kernel-qcow2-linux-cc3dbd0a9178865d4444f8e28b51715808e9ac85.tar.xz
kernel-qcow2-linux-cc3dbd0a9178865d4444f8e28b51715808e9ac85.zip
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>
Diffstat (limited to 'drivers/scsi/isci/request.c')
-rw-r--r--drivers/scsi/isci/request.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 36adc1589efa..0521c045d43b 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -201,7 +201,7 @@ static enum sci_status isci_io_request_build(
* we will let the core allocate the IO tag.
*/
status = scic_io_request_construct(
- isci_host->core_controller,
+ &isci_host->sci,
sci_device,
SCI_CONTROLLER_INVALID_IO_TAG,
request,
@@ -394,7 +394,7 @@ int isci_request_execute(
/* send the request, let the core assign the IO TAG. */
status = scic_controller_start_io(
- isci_host->core_controller,
+ &isci_host->sci,
sci_device,
request->sci_request_handle,
SCI_CONTROLLER_INVALID_IO_TAG
@@ -1186,7 +1186,7 @@ void isci_request_io_request_complete(
);
/* complete the io request to the core. */
- scic_controller_complete_io(isci_host->core_controller,
+ scic_controller_complete_io(&isci_host->sci,
&isci_device->sci,
request->sci_request_handle);
/* NULL the request handle so it cannot be completed or