[35/50] qla1280: Use blk_req() instead of scsi_cmnd.request

Message ID	20210514213356.5264-36-bvanassche@acm.org
State	Superseded
Headers	show Return-Path: <linux-scsi-owner@kernel.org> From: Bart Van Assche <bvanassche@acm.org> To: "Martin K . Petersen" <martin.petersen@oracle.com> Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>, Michael Reed <mdr@sgi.com>, "James E.J. Bottomley" <jejb@linux.ibm.com> Subject: [PATCH 35/50] qla1280: Use blk_req() instead of scsi_cmnd.request Date: Fri, 14 May 2021 14:32:50 -0700 Message-Id: <20210514213356.5264-36-bvanassche@acm.org> In-Reply-To: <20210514213356.5264-1-bvanassche@acm.org> References: <20210514213356.5264-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/50] core: Introduce the blk_req() function \| expand [01/50] core: Introduce the blk_req() function [03/50] sd: Use blk_req() instead of scsi_cmnd.request [09/50] rdma/srp: Use blk_req() instead of scsi_cmnd.request [11/50] 53c700: Use blk_req() instead of scsi_cmnd.request [13/50] aacraid: Use blk_req() instead of scsi_cmnd.request [15/50] bnx2i: Use blk_req() instead of scsi_cmnd.request [17/50] cxlflash: Use blk_req() instead of scsi_cmnd.request [19/50] fnic: Use blk_req() instead of scsi_cmnd.request [21/50] hpsa: Use blk_req() instead of scsi_cmnd.request [25/50] libsas: Use blk_req() instead of scsi_cmnd.request [27/50] megaraid: Use blk_req() instead of scsi_cmnd.request [29/50] mvumi: Use blk_req() instead of scsi_cmnd.request [31/50] myrs: Use blk_req() instead of scsi_cmnd.request [33/50] qedf: Use blk_req() instead of scsi_cmnd.request [35/50] qla1280: Use blk_req() instead of scsi_cmnd.request [37/50] qla4xxx: Use blk_req() instead of scsi_cmnd.request [39/50] scsi_debug: Use blk_req() instead of scsi_cmnd.request [41/50] snic: Use blk_req() instead of scsi_cmnd.request [43/50] sun3_scsi: Use blk_req() instead of scsi_cmnd.request [45/50] ufs: Use blk_req() instead of scsi_cmnd.request [46/50] virtio_scsi: Use blk_req() instead of scsi_cmnd.request [48/50] tcm_loop: Use blk_req() instead of scsi_cmnd.request [50/50] core: Remove the request member from struct scsi_cmnd [02/50] core: Use blk_req() instead of scsi_cmnd.request [04/50] sr: Use blk_req() instead of scsi_cmnd.request [07/50] ata: Use blk_req() instead of scsi_cmnd.request [08/50] rdma/iser: Use blk_req() instead of scsi_cmnd.request [10/50] zfcp: Use blk_req() instead of scsi_cmnd.request [12/50] NCR5380: Use blk_req() instead of scsi_cmnd.request [14/50] advansys: Use blk_req() instead of scsi_cmnd.request [16/50] csiostor: Use blk_req() instead of scsi_cmnd.request [18/50] dpt_i2o: Use blk_req() instead of scsi_cmnd.request [20/50] hisi_sas: Use blk_req() instead of scsi_cmnd.request [22/50] ibmvfc: Use blk_req() instead of scsi_cmnd.request [24/50] ips: Use blk_req() instead of scsi_cmnd.request

Message ID

20210514213356.5264-36-bvanassche@acm.org

State

Superseded

Headers

From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
	Michael Reed <mdr@sgi.com>, "James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH 35/50] qla1280: Use blk_req() instead of scsi_cmnd.request
Date: Fri, 14 May 2021 14:32:50 -0700
Message-Id: <20210514213356.5264-36-bvanassche@acm.org>
In-Reply-To: <20210514213356.5264-1-bvanassche@acm.org>
References: <20210514213356.5264-1-bvanassche@acm.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[01/50] core: Introduce the blk_req() function | expand

Commit Message

Bart Van Assche May 14, 2021, 9:32 p.m. UTC

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

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/scsi/qla1280.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 928da90b79be..a9a8e1e9c253 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -490,7 +490,7 @@  __setup("qla1280=", qla1280_setup);
 #define	CMD_SNSLEN(Cmnd)	SCSI_SENSE_BUFFERSIZE
 #define	CMD_RESULT(Cmnd)	Cmnd->result
 #define	CMD_HANDLE(Cmnd)	Cmnd->host_scribble
-#define CMD_REQUEST(Cmnd)	Cmnd->request->cmd
+#define CMD_REQUEST(Cmnd)	blk_req(Cmnd)->cmd
 
 #define CMD_HOST(Cmnd)		Cmnd->device->host
 #define SCSI_BUS_32(Cmnd)	Cmnd->device->channel
@@ -2827,7 +2827,7 @@  qla1280_64bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
 	memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));
 
 	/* Set ISP command timeout. */
-	pkt->timeout = cpu_to_le16(cmd->request->timeout/HZ);
+	pkt->timeout = cpu_to_le16(blk_req(cmd)->timeout / HZ);
 
 	/* Set device target ID and LUN */
 	pkt->lun = SCSI_LUN_32(cmd);
@@ -3082,7 +3082,7 @@  qla1280_32bit_start_scsi(struct scsi_qla_host *ha, struct srb * sp)
 	memset(((char *)pkt + 8), 0, (REQUEST_ENTRY_SIZE - 8));
 
 	/* Set ISP command timeout. */
-	pkt->timeout = cpu_to_le16(cmd->request->timeout/HZ);
+	pkt->timeout = cpu_to_le16(blk_req(cmd)->timeout / HZ);
 
 	/* Set device target ID and LUN */
 	pkt->lun = SCSI_LUN_32(cmd);

[35/50] qla1280: Use blk_req() instead of scsi_cmnd.request

Commit Message

Patch