Commit 1ae6d167 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

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: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5f9ae9ee

drivers/message/fusion/mptfc.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

drivers/message/fusion/mptsas.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/message/fusion/mptscsih.c

+5 −5
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) 
	/* 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;

	}

drivers/message/fusion/mptspi.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}