scsi: message: fusion: Call scsi_done() directly

Conditional statements are faster than indirect calls. Hence call
scsi_done() directly.

Link: https://lore.kernel.org/r/20211007202923.2174984-7-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 572333fadd68cad6d9f4452caea3264373b01dd9..7a6278ae71d22d0293eda8dfac62db6760e87e7b 100644 (file)
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -649,14 +649,14 @@ mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt)
 
        if (!vdevice || !vdevice->vtarget) {
                SCpnt->result = DID_NO_CONNECT << 16;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                return 0;
        }
 
        err = fc_remote_port_chkready(rport);
        if (unlikely(err)) {
                SCpnt->result = err;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                return 0;
        }
 
@@ -664,7 +664,7 @@ mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt)
        ri = *((struct mptfc_rport_info **)rport->dd_data);
        if (unlikely(!ri)) {
                SCpnt->result = DID_IMM_RETRY << 16;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                return 0;
        }
 

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 85285ba8e81799353f3b8247295c3e50906cff45..38a7cb0a3ecc0598b02560db3c2e93877f68348c 100644 (file)
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1929,7 +1929,7 @@ mptsas_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt)
 
        if (!vdevice || !vdevice->vtarget || vdevice->vtarget->deleted) {
                SCpnt->result = DID_NO_CONNECT << 16;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                return 0;
        }
 

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index ce2e5b21978e21e0a25bfe6e4508cc39f5a43aed..ab9611e775d364beea4817bfe8c7826dd38db3c8 100644 (file)
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1009,7 +1009,7 @@ out:
        /* Unmap the DMA buffers, if any. */
        scsi_dma_unmap(sc);
 
-       sc->scsi_done(sc);              /* Issue the command callback */
+       scsi_done(sc);                  /* Issue the command callback */
 
        /* Free Chain buffers */
        mptscsih_freeChainBuffers(ioc, req_idx);
@@ -1054,7 +1054,7 @@ mptscsih_flush_running_cmds(MPT_SCSI_HOST *hd)
                dtmprintk(ioc, sdev_printk(KERN_INFO, sc->device, MYIOC_s_FMT
                    "completing cmds: fw_channel %d, fw_id %d, sc=%p, mf = %p, "
                    "idx=%x\n", ioc->name, channel, id, sc, mf, ii));
-               sc->scsi_done(sc);
+               scsi_done(sc);
        }
 }
 EXPORT_SYMBOL(mptscsih_flush_running_cmds);
@@ -1118,7 +1118,7 @@ mptscsih_search_running_cmds(MPT_SCSI_HOST *hd, VirtDevice *vdevice)
                           "fw_id %d, sc=%p, mf = %p, idx=%x\n", ioc->name,
                           vdevice->vtarget->channel, vdevice->vtarget->id,
                           sc, mf, ii));
-                       sc->scsi_done(sc);
+                       scsi_done(sc);
                        spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
                }
        }
@@ -1693,7 +1693,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
         */
        if ((hd = shost_priv(SCpnt->device->host)) == NULL) {
                SCpnt->result = DID_RESET << 16;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                printk(KERN_ERR MYNAM ": task abort: "
                    "can't locate host! (sc=%p)\n", SCpnt);
                return FAILED;
@@ -1710,7 +1710,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
                    "task abort: device has been deleted (sc=%p)\n",
                    ioc->name, SCpnt));
                SCpnt->result = DID_NO_CONNECT << 16;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                retval = SUCCESS;
                goto out;
        }

diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index af0ce5611e4accdd49d40041cce3488bf58c6d56..44b7ce124ae1673c8f33146de4d8b83fad752cf3 100644 (file)
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -782,14 +782,14 @@ mptspi_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt)
 
        if (!vdevice || !vdevice->vtarget) {
                SCpnt->result = DID_NO_CONNECT << 16;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                return 0;
        }
 
        if (SCpnt->device->channel == 1 &&
                mptscsih_is_phys_disk(ioc, 0, SCpnt->device->id) == 0) {
                SCpnt->result = DID_NO_CONNECT << 16;
-               SCpnt->scsi_done(SCpnt);
+               scsi_done(SCpnt);
                return 0;
        }