From: Bart Van Assche <bvanassche@acm.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH 84/84] scsi_lib: Call scsi_done() directly
Date: Tue, 21 Sep 2021 10:34:36 -0700 [thread overview]
Message-ID: <20210921173436.3533078-6-bvanassche@acm.org> (raw)
In-Reply-To: <20210921173436.3533078-1-bvanassche@acm.org>
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.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/scsi_lib.c | 3 +--
include/scsi/scsi_cmnd.h | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index c3a0283dbff0..be1a21cec54b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1520,7 +1520,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
return rtn;
done:
- cmd->scsi_done(cmd);
+ scsi_done(cmd);
return 0;
}
@@ -1693,7 +1693,6 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
scsi_set_resid(cmd, 0);
memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
- cmd->scsi_done = scsi_done;
blk_mq_start_request(req);
reason = scsi_dispatch_cmd(cmd);
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 5b230d06527f..045f8c08ab70 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -124,10 +124,6 @@ struct scsi_cmnd {
* command (auto-sense). Length must be
* 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.
* Everything else should be left alone.
next prev parent reply other threads:[~2021-09-21 17:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 17:34 [PATCH 79/84] xen-scsifront: Call scsi_done() directly Bart Van Assche
2021-09-21 17:34 ` [PATCH 80/84] staging: rts5208: " Bart Van Assche
2021-09-22 6:30 ` Greg Kroah-Hartman
2021-09-22 16:31 ` Bart Van Assche
2021-09-21 17:34 ` [PATCH 81/84] staging: unisys: visorhba: " Bart Van Assche
2021-09-23 6:49 ` Greg Kroah-Hartman
2021-09-21 17:34 ` [PATCH 82/84] target/tcm_loop: " Bart Van Assche
2021-09-21 17:34 ` [PATCH 83/84] usb: " Bart Van Assche
2021-09-21 17:34 ` Bart Van Assche [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-09-18 0:04 [PATCH 00/84] " Bart Van Assche
2021-09-22 16:25 ` [PATCH 79/84] xen-scsifront: " Bart Van Assche
2021-09-22 16:26 ` [PATCH 84/84] scsi_lib: " Bart Van Assche
2021-09-28 17:04 ` Benjamin Block
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210921173436.3533078-6-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=20210918000607.450448-1-bvanassche@acm.org \
--cc=boris.ostrovsky@oracle.com \
--cc=jejb@linux.ibm.com \
--cc=jgross@suse.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).