leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: core: Call scsi_done directly

Browse Source 
Conditional statements are faster than indirect calls. Hence call
scsi_done() directly. Since this patch removes the last user of the
scsi_done member, also remove that data structure member.

Link: https://lore.kernel.org/r/20211007204618.2196847-11-bvanassche@acm.org
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
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-10-07 13:46:11 -07:00 committed by Martin K. Petersen
parent 46c97948e9
commit 11b68e36b1
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/hosts.c
View File

@ -667,7 +667,7 @@ static bool complete_all_cmds_iter(struct request *rq, void *data, bool rsvd)
scsi_dma_unmap(scmd); scsi_dma_unmap(scmd);
scmd->result = 0; scmd->result = 0;
set_host_byte(scmd, status); set_host_byte(scmd, status);
scmd->scsi_done(scmd); scsi_done(scmd);
return true; return true;
} }

3
drivers/scsi/scsi_lib.c
View File

@ -1520,7 +1520,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
return rtn; return rtn;
done: done:
cmd->scsi_done(cmd); scsi_done(cmd);
return 0; return 0;
} }
@ -1694,7 +1694,6 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
scsi_set_resid(cmd, 0); scsi_set_resid(cmd, 0);
memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
cmd->submitter = SUBMITTED_BY_BLOCK_LAYER; cmd->submitter = SUBMITTED_BY_BLOCK_LAYER;
cmd->scsi_done = scsi_done;
blk_mq_start_request(req); blk_mq_start_request(req);
reason = scsi_dispatch_cmd(cmd); reason = scsi_dispatch_cmd(cmd);

4
include/scsi/scsi_cmnd.h
View File

@ -123,10 +123,6 @@ struct scsi_cmnd {
* command (auto-sense). Length must be * command (auto-sense). Length must be
* SCSI_SENSE_BUFFERSIZE bytes. */ * SCSI_SENSE_BUFFERSIZE bytes. */
/* Low-level done function - can be used by low-level driver to point
* to completion function. Not used by mid/upper level code. */
void (*scsi_done) (struct scsi_cmnd *);
/* /*
* The following fields can be written to by the host specific code. * The following fields can be written to by the host specific code.
* Everything else should be left alone. * Everything else should be left alone.

2
include/scsi/scsi_host.h
View File

@ -516,7 +516,7 @@ struct scsi_host_template {
unsigned long irq_flags; \ unsigned long irq_flags; \
int rc; \ int rc; \
spin_lock_irqsave(shost->host_lock, irq_flags); \ spin_lock_irqsave(shost->host_lock, irq_flags); \
rc = func_name##_lck (cmd, cmd->scsi_done); \ rc = func_name##_lck(cmd, scsi_done); \
spin_unlock_irqrestore(shost->host_lock, irq_flags); \ spin_unlock_irqrestore(shost->host_lock, irq_flags); \
return rc; \ return rc; \
} }