isci: move stp request info to scic_sds_request

In preparation for unifying allocation of all request information make stp
data available in all requests.  Incidentally collapse indentation.

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

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index cabad0b03ee..12f2df94736 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -64,7 +64,7 @@
 #include "request.h"
 #include "sata.h"
 #include "task.h"
-#include "scic_sds_stp_request.h"
+#include "scic_sds_request.h"
 
 /**
 * isci_task_refuse() - complete the request to the upper layer driver in
@@ -1435,8 +1435,7 @@ isci_task_request_complete(struct isci_host *ihost,
         struct isci_tmf *tmf = isci_request_access_tmf(ireq);
         struct completion *tmf_complete;
         struct scic_sds_request *sci_req = ireq->sci_request_handle;
-        struct scic_sds_stp_request *stp_req =
-                container_of(sci_req, typeof(*stp_req), parent);
+        struct scic_sds_stp_request *stp_req = &sci_req->stp.req;
 
         dev_dbg(&ihost->pdev->dev,
                 "%s: request = %p, status=%d\n",