Commit bbfa8d7d authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: stex: 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-45-bvanassche@acm.org


Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ec808ef9

drivers/scsi/stex.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	if (likely(cmd)) {

		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->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;



	tag = cmd->request->tag;

	tag = scsi_cmd_to_rq(cmd)->tag;



	if (unlikely(tag >= host->can_queue))

		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 st_hba *hba = (struct st_hba *)host->hostdata;

	u16 tag = cmd->request->tag;

	u16 tag = scsi_cmd_to_rq(cmd)->tag;

	void __iomem *base;

	u32 data;

	int result = SUCCESS;