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

scsi: stex: 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-45-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:47 -07:00
committed by Martin K. Petersen
parent ec808ef9b8
commit bbfa8d7d12
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/stex.c
View File

@@ -540,7 +540,7 @@ stex_ss_send_cmd(struct st_hba *hba, struct req_msg *req, u16 tag)
msg_h = (struct st_msg_header *)req - 1; msg_h = (struct st_msg_header *)req - 1;
if (likely(cmd)) { if (likely(cmd)) {
msg_h->channel = (u8)cmd->device->channel; msg_h->channel = (u8)cmd->device->channel;
msg_h->timeout = cpu_to_le16(cmd->request->timeout/HZ); msg_h->timeout = cpu_to_le16(scsi_cmd_to_rq(cmd)->timeout / HZ);
} }
addr = hba->dma_handle + hba->req_head * hba->rq_size; addr = hba->dma_handle + hba->req_head * hba->rq_size;
addr += (hba->ccb[tag].sg_count+4)/11; addr += (hba->ccb[tag].sg_count+4)/11;
@@ -690,7 +690,7 @@ stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
cmd->scsi_done = done; cmd->scsi_done = done;
tag = cmd->request->tag; tag = scsi_cmd_to_rq(cmd)->tag;
if (unlikely(tag >= host->can_queue)) if (unlikely(tag >= host->can_queue))
return SCSI_MLQUEUE_HOST_BUSY; return SCSI_MLQUEUE_HOST_BUSY;
@@ -1246,7 +1246,7 @@ static int stex_abort(struct scsi_cmnd *cmd)
{ {
struct Scsi_Host *host = cmd->device->host; struct Scsi_Host *host = cmd->device->host;
struct st_hba *hba = (struct st_hba *)host->hostdata; struct st_hba *hba = (struct st_hba *)host->hostdata;
u16 tag = cmd->request->tag; u16 tag = scsi_cmd_to_rq(cmd)->tag;
void __iomem *base; void __iomem *base;
u32 data; u32 data;
int result = SUCCESS; int result = SUCCESS;