diff mbox series

[18/50] dpt_i2o: Use blk_req() instead of scsi_cmnd.request

Message ID	20210514213356.5264-70-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>, Adaptec OEM Raid Solutions <aacraid@microsemi.com>, "James E.J. Bottomley" <jejb@linux.ibm.com> Subject: [PATCH 18/50] dpt_i2o: Use blk_req() instead of scsi_cmnd.request Date: Fri, 14 May 2021 14:33:24 -0700 Message-Id: <20210514213356.5264-70-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

Commit Message

Bart Van Assche May 14, 2021, 9:33 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/dpt_i2o.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index a18a4a08f049..75fbbd939b4a 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -652,7 +652,7 @@  static int adpt_abort(struct scsi_cmnd * cmd)
 	msg[2] = 0;
 	msg[3]= 0;
 	/* Add 1 to avoid firmware treating it as invalid command */
-	msg[4] = cmd->request->tag + 1;
+	msg[4] = blk_req(cmd)->tag + 1;
 	if (pHba->host)
 		spin_lock_irq(pHba->host->host_lock);
 	rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER);
@@ -2236,7 +2236,7 @@  static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d
 	msg[1] = ((0xff<<24)|(HOST_TID<<12)|d->tid);
 	msg[2] = 0;
 	/* Add 1 to avoid firmware treating it as invalid command */
-	msg[3] = cmd->request->tag + 1;
+	msg[3] = blk_req(cmd)->tag + 1;
 	// Our cards use the transaction context as the tag for queueing
 	// Adaptec/DPT Private stuff 
 	msg[4] = I2O_CMD_SCSI_EXEC|(DPT_ORGANIZATION_ID<<16);