scsi: advansys: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
authorBart Van Assche <bvanassche@acm.org>
Mon, 9 Aug 2021 23:03:17 +0000 (16:03 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 12 Aug 2021 02:25:38 +0000 (22:25 -0400)
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-15-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/advansys.c

index f3377e2..ffb3919 100644 (file)
@@ -7423,7 +7423,7 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,
         * Set the srb_tag to the command tag + 1, as
         * srb_tag '0' is used internally by the chip.
         */
-       srb_tag = scp->request->tag + 1;
+       srb_tag = scsi_cmd_to_rq(scp)->tag + 1;
        asc_scsi_q->q2.srb_tag = srb_tag;
 
        /*
@@ -7637,7 +7637,7 @@ static int
 adv_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,
              adv_req_t **adv_reqpp)
 {
-       u32 srb_tag = scp->request->tag;
+       u32 srb_tag = scsi_cmd_to_rq(scp)->tag;
        adv_req_t *reqp;
        ADV_SCSI_REQ_Q *scsiqp;
        int ret;