moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: dpt_i2o: Use scsi_cmd_to_rq() instead of scsi_cmnd.request

Browse Source 
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-20-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche
2021-08-09 16:03:22 -07:00
committed by Martin K. Petersen
parent d3e16aecea
commit 3ada9c791b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/dpt_i2o.c
View File

@@ -652,7 +652,7 @@ static int adpt_abort(struct scsi_cmnd * cmd)
msg[2] = 0; msg[2] = 0;
msg[3]= 0; msg[3]= 0;
/* Add 1 to avoid firmware treating it as invalid command */ /* Add 1 to avoid firmware treating it as invalid command */
msg[4] = cmd->request->tag + 1; msg[4] = scsi_cmd_to_rq(cmd)->tag + 1;
if (pHba->host) if (pHba->host)
spin_lock_irq(pHba->host->host_lock); spin_lock_irq(pHba->host->host_lock);
rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER); 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[1] = ((0xff<<24)|(HOST_TID<<12)|d->tid);
msg[2] = 0; msg[2] = 0;
/* Add 1 to avoid firmware treating it as invalid command */ /* Add 1 to avoid firmware treating it as invalid command */
msg[3] = cmd->request->tag + 1; msg[3] = scsi_cmd_to_rq(cmd)->tag + 1;
// Our cards use the transaction context as the tag for queueing // Our cards use the transaction context as the tag for queueing
// Adaptec/DPT Private stuff // Adaptec/DPT Private stuff
msg[4] = I2O_CMD_SCSI_EXEC|(DPT_ORGANIZATION_ID<<16); msg[4] = I2O_CMD_SCSI_EXEC|(DPT_ORGANIZATION_ID<<16);