isci: remove sci_device_handle

It belies the fact that isci_remote_device and scic_sds_remote_device
are one in same object with the same lifetime rules.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 81a77335fdb3..6b0863e73f22 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -179,8 +179,7 @@ static enum sci_status isci_io_request_build(
         struct smp_discover_response_protocols dev_protocols;
         enum sci_status status = SCI_SUCCESS;
         struct sas_task *task = isci_request_access_task(request);
-        struct scic_sds_remote_device *sci_device =
-                isci_device->sci_device_handle;
+        struct scic_sds_remote_device *sci_device = to_sci_dev(isci_device);
 
         dev_dbg(&isci_host->pdev->dev,
                 "%s: isci_device = 0x%p; request = %p, "
@@ -408,7 +407,7 @@ int isci_request_execute(
         unsigned long flags;
 
         isci_device = isci_dev_from_domain_dev(task->dev);
-        sci_device = isci_device->sci_device_handle;
+        sci_device = to_sci_dev(isci_device);
 
         /* do common allocation and init of request object. */
         ret = isci_request_alloc_io(
@@ -1177,7 +1176,7 @@ void isci_request_io_request_complete(
         /* complete the io request to the core. */
         scic_controller_complete_io(
                 isci_host->core_controller,
-                isci_device->sci_device_handle,
+                to_sci_dev(isci_device),
                 request->sci_request_handle
                 );
         /* NULL the request handle so it cannot be completed or