scsi: myrb: 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.

Link: https://lore.kernel.org/r/20210809230355.8186-33-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
index 542ed88ef90d838b8d58d6631c1117268c9a5c5c..a4a88323e0209adb1feb31e02a7663fc175f3320 100644 (file)
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -1263,6 +1263,7 @@ static int myrb_host_reset(struct scsi_cmnd *scmd)
 static int myrb_pthru_queuecommand(struct Scsi_Host *shost,
                struct scsi_cmnd *scmd)
 {
+       struct request *rq = scsi_cmd_to_rq(scmd);
        struct myrb_hba *cb = shost_priv(shost);
        struct myrb_cmdblk *cmd_blk = scsi_cmd_priv(scmd);
        union myrb_cmd_mbox *mbox = &cmd_blk->mbox;
@@ -1286,7 +1287,7 @@ static int myrb_pthru_queuecommand(struct Scsi_Host *shost,
        }
 
        mbox->type3.opcode = MYRB_CMD_DCDB;
-       mbox->type3.id = scmd->request->tag + 3;
+       mbox->type3.id = rq->tag + 3;
        mbox->type3.addr = dcdb_addr;
        dcdb->channel = sdev->channel;
        dcdb->target = sdev->id;
@@ -1305,11 +1306,11 @@ static int myrb_pthru_queuecommand(struct Scsi_Host *shost,
                break;
        }
        dcdb->early_status = false;
-       if (scmd->request->timeout <= 10)
+       if (rq->timeout <= 10)
                dcdb->timeout = MYRB_DCDB_TMO_10_SECS;
-       else if (scmd->request->timeout <= 60)
+       else if (rq->timeout <= 60)
                dcdb->timeout = MYRB_DCDB_TMO_60_SECS;
-       else if (scmd->request->timeout <= 600)
+       else if (rq->timeout <= 600)
                dcdb->timeout = MYRB_DCDB_TMO_10_MINS;
        else
                dcdb->timeout = MYRB_DCDB_TMO_24_HRS;
@@ -1550,7 +1551,7 @@ static int myrb_ldev_queuecommand(struct Scsi_Host *shost,
        }
 
        myrb_reset_cmd(cmd_blk);
-       mbox->type5.id = scmd->request->tag + 3;
+       mbox->type5.id = scsi_cmd_to_rq(scmd)->tag + 3;
        if (scmd->sc_data_direction == DMA_NONE)
                goto submit;
        nsge = scsi_dma_map(scmd);