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>,
Saurav Kashyap <skashyap@marvell.com>,
Javed Hasan <jhasan@marvell.com>,
GR-QLogic-Storage-Upstream@marvell.com,
"James E.J. Bottomley" <jejb@linux.ibm.com>
Subject: [PATCH v3 63/88] qedf: Call scsi_done() directly
Date: Thu, 7 Oct 2021 13:28:58 -0700 [thread overview]
Message-ID: <20211007202923.2174984-64-bvanassche@acm.org> (raw)
In-Reply-To: <20211007202923.2174984-1-bvanassche@acm.org>
Conditional statements are faster than indirect calls. Hence call
scsi_done() directly.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/qedf/qedf_io.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
index 3404782988d5..14aa544b0bc3 100644
--- a/drivers/scsi/qedf/qedf_io.c
+++ b/drivers/scsi/qedf/qedf_io.c
@@ -947,7 +947,7 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)
"Number of SG elements %d exceeds what hardware limitation of %d.\n",
num_sgs, QEDF_MAX_BDS_PER_CMD);
sc_cmd->result = DID_ERROR;
- sc_cmd->scsi_done(sc_cmd);
+ scsi_done(sc_cmd);
return 0;
}
@@ -957,7 +957,7 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)
"Returning DNC as unloading or stop io, flags 0x%lx.\n",
qedf->flags);
sc_cmd->result = DID_NO_CONNECT << 16;
- sc_cmd->scsi_done(sc_cmd);
+ scsi_done(sc_cmd);
return 0;
}
@@ -966,7 +966,7 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)
"Completing sc_cmd=%p DID_NO_CONNECT as MSI-X is not enabled.\n",
sc_cmd);
sc_cmd->result = DID_NO_CONNECT << 16;
- sc_cmd->scsi_done(sc_cmd);
+ scsi_done(sc_cmd);
return 0;
}
@@ -976,7 +976,7 @@ qedf_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc_cmd)
"fc_remote_port_chkready failed=0x%x for port_id=0x%06x.\n",
rval, rport->port_id);
sc_cmd->result = rval;
- sc_cmd->scsi_done(sc_cmd);
+ scsi_done(sc_cmd);
return 0;
}
@@ -1313,7 +1313,7 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,
io_req->sc_cmd = NULL;
sc_cmd->SCp.ptr = NULL;
- sc_cmd->scsi_done(sc_cmd);
+ scsi_done(sc_cmd);
kref_put(&io_req->refcount, qedf_release_cmd);
}
@@ -1386,13 +1386,6 @@ void qedf_scsi_done(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,
goto bad_scsi_ptr;
}
- if (!sc_cmd->scsi_done) {
- QEDF_ERR(&qedf->dbg_ctx,
- "sc_cmd->scsi_done for sc_cmd %p is NULL.\n",
- sc_cmd);
- goto bad_scsi_ptr;
- }
-
qedf_unmap_sg_list(qedf, io_req);
sc_cmd->result = result << 16;
@@ -1417,7 +1410,7 @@ void qedf_scsi_done(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,
io_req->sc_cmd = NULL;
sc_cmd->SCp.ptr = NULL;
- sc_cmd->scsi_done(sc_cmd);
+ scsi_done(sc_cmd);
kref_put(&io_req->refcount, qedf_release_cmd);
return;
next prev parent reply other threads:[~2021-10-07 20:33 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 20:27 [PATCH v3 00/88] Call scsi_done() directly Bart Van Assche
2021-10-07 20:27 ` [PATCH v3 01/88] scsi: core: Use a structure member to track the SCSI command submitter Bart Van Assche
2021-10-07 20:27 ` [PATCH v3 02/88] scsi: core: Rename scsi_mq_done() into scsi_done() and export it Bart Van Assche
2021-10-07 20:27 ` [PATCH v3 03/88] ata: Call scsi_done() directly Bart Van Assche
2021-10-07 20:27 ` [PATCH v3 04/88] firewire: sbp2: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 05/88] ib_srp: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 06/88] message: fusion: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 07/88] zfcp_scsi: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 08/88] 3w-9xxx: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 09/88] 3w-sas: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 10/88] 3w-xxxx: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 11/88] 53c700: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 12/88] BusLogic: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 13/88] NCR5380: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 14/88] a100u2w: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 15/88] aacraid: Introduce aac_scsi_done() Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 16/88] aacraid: Call scsi_done() directly Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 17/88] acornscsi: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 18/88] advansys: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 19/88] aha152x: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 20/88] aha1542: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 21/88] aic7xxx: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 22/88] arcmsr: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 23/88] atp870u: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 24/88] bfa: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 25/88] bnx2fc: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 26/88] csiostor: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 27/88] cxlflash: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 28/88] dc395x: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 29/88] dpt_i2o: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 30/88] esas2r: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 31/88] esp_scsi: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 32/88] fas216: Introduce struct fas216_cmd_priv Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 33/88] fas216: Stop using scsi_cmnd.scsi_done Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 34/88] fdomain: Call scsi_done() directly Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 35/88] fnic: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 36/88] hpsa: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 37/88] hptiop: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 38/88] ibmvscsi: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 39/88] imm: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 40/88] initio: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 41/88] ipr: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 42/88] ips: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 43/88] libfc: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 44/88] libiscsi: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 45/88] libsas: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 46/88] lpfc: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 47/88] mac53c94: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 48/88] megaraid: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 49/88] " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 50/88] mesh: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 51/88] mpi3mr: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 52/88] mpt3sas: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 53/88] mvumi: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 54/88] myrb: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 55/88] myrs: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 56/88] ncr53c8xx: Remove unused code Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 57/88] ncr53c8xx: Call scsi_done() directly Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 58/88] nsp32: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 59/88] pcmcia: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 60/88] pmcraid: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 61/88] ppa: " Bart Van Assche
2021-10-07 20:28 ` [PATCH v3 62/88] ps3rom: " Bart Van Assche
2021-10-07 20:28 ` Bart Van Assche [this message]
2021-10-07 20:28 ` [PATCH v3 64/88] qla1280: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 65/88] qla2xxx: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 66/88] qla4xxx: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 67/88] qlogicfas408: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 68/88] qlogicpti: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 69/88] scsi_debug: " Bart Van Assche
2021-10-07 21:50 ` Douglas Gilbert
2021-10-07 20:29 ` [PATCH v3 70/88] smartpqi: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 71/88] snic: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 72/88] stex: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 73/88] storvsc_drv: " Bart Van Assche
2021-10-07 20:29 ` [PATCH v3 74/88] sym53c8xx_2: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 75/88] ufs: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 76/88] virtio_scsi: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 77/88] vmw_pvscsi: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 78/88] wd33c93: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 79/88] wd719x: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 80/88] xen-scsifront: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 81/88] staging: rts5208: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 82/88] staging: unisys: visorhba: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 83/88] target/tcm_loop: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 84/88] usb: " Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 85/88] scsi: core: Call scsi_done directly Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 86/88] isci: Remove a declaration Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 87/88] fas216: Introduce the function fas216_queue_command_internal() Bart Van Assche
2021-10-07 20:46 ` [PATCH v3 88/88] scsi: Remove the 'done' argument from SCSI queuecommand_lck functions Bart Van Assche
2021-10-17 1:48 ` [PATCH v3 00/88] Call scsi_done() directly Martin K. Petersen
2021-10-21 3:42 ` Martin K. Petersen
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=20211007202923.2174984-64-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=GR-QLogic-Storage-Upstream@marvell.com \
--cc=jejb@linux.ibm.com \
--cc=jhasan@marvell.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=skashyap@marvell.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).