From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 9 Aug 2021 23:03:28 +0000 (-0700)
Subject: scsi: ips: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=240ec1197786f5c81e957f256f9eebc46d5a07a4;p=linux.git

scsi: ips: 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-26-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/ips.c b/drivers/scsi/ips.c
index 8b33c9871484b..cdd94fb2aab7d 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -3735,7 +3735,7 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)
 		scb->cmd.dcdb.segment_4G = 0;
 		scb->cmd.dcdb.enhanced_sg = 0;
 
-		TimeOut = scb->scsi_cmd->request->timeout;
+		TimeOut = scsi_cmd_to_rq(scb->scsi_cmd)->timeout;
 
 		if (ha->subsys->param[4] & 0x00100000) {	/* If NEW Tape DCDB is Supported */
 			if (!scb->sg_len) {