RE: [PATCH v4 22/52] hpsa: Use scsi_cmd_to_rq() instead of scsi_cmnd.request

[<Don.Brace@xxxxxxxxxxxxx>]

-----Original Message-----
From: Bart Van Assche [mailto:bvanassche@xxxxxxx] 
Subject: [PATCH v4 22/52] hpsa: Use scsi_cmd_to_rq() instead of scsi_cmnd.request


Prepare for removal of the request pointer by using scsi_cmd_to_rq() instead. This patch does not change any functionality.

Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>

Acked-by: Don Brace <don.brace@xxxxxxxxxxxxx>

---
 drivers/scsi/hpsa.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index f135a10f582b..3faa87fa296a 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5686,7 +5686,7 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
        /* Get the ptr to our adapter structure out of cmd->host. */
        h = sdev_to_hba(cmd->device);

-       BUG_ON(cmd->request->tag < 0);
+       BUG_ON(scsi_cmd_to_rq(cmd)->tag < 0);

        dev = cmd->device->hostdata;
        if (!dev) {
@@ -5729,7 +5729,7 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
         *       and is therefore a brand-new command.
         */
        if (likely(cmd->retries == 0 &&
-                       !blk_rq_is_passthrough(cmd->request) &&
+                       !blk_rq_is_passthrough(scsi_cmd_to_rq(cmd)) &&
                        h->acciopath_status)) {
                /* Submit with the retry_pending flag unset. */
                rc = hpsa_ioaccel_submit(h, c, cmd, false); @@ -5894,7 +5894,7 @@ static int hpsa_scsi_add_host(struct ctlr_info *h)
  */
 static int hpsa_get_cmd_index(struct scsi_cmnd *scmd)  {
-       int idx = scmd->request->tag;
+       int idx = scsi_cmd_to_rq(scmd)->tag;

        if (idx < 0)
                return idx;