scsi: core: Remove scsi_init_cmd_errh

There is no good reason to keep this functionality as a separate function,
just merge it into the only caller.

Link: https://lore.kernel.org/r/20201005084130.143273-3-hch@lst.de
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 996ab5ab6fdae89ab68bba48f2709f79dc9279c9..b515560eaf020100f672372080e1935499bb6d86 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -293,21 +293,6 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
 }
 EXPORT_SYMBOL(__scsi_execute);
 
-/**
- * scsi_init_cmd_errh - Initialize cmd fields related to error handling.
- * @cmd:  command that is ready to be queued.
- *
- * This function has the job of initializing a number of fields related to error
- * handling. Typically this will be called once for each command, as required.
- */
-static void scsi_init_cmd_errh(struct scsi_cmnd *cmd)
-{
-       scsi_set_resid(cmd, 0);
-       memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
-       if (cmd->cmd_len == 0)
-               cmd->cmd_len = scsi_command_size(cmd->cmnd);
-}
-
 /*
  * Wake up the error handler if necessary. Avoid as follows that the error
  * handler is not woken up if host in-flight requests number ==
@@ -1707,7 +1692,10 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
        if (bd->last)
                cmd->flags |= SCMD_LAST;
 
-       scsi_init_cmd_errh(cmd);
+       scsi_set_resid(cmd, 0);
+       memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
+       if (cmd->cmd_len == 0)
+               cmd->cmd_len = scsi_command_size(cmd->cmnd);
        cmd->scsi_done = scsi_mq_done;
 
        reason = scsi_dispatch_cmd(cmd);