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

scsi: hpsa: Call scsi_done() directly 

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

Link: https://lore.kernel.org/r/20211007202923.2174984-37-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 a7510fbd

drivers/scsi/hpsa.c

+6 −6
Original line number Diff line number Diff line
@@ -2482,8 +2482,8 @@ static void hpsa_cmd_free_and_done(struct ctlr_info *h, 
		struct CommandList *c, struct scsi_cmnd *cmd)

{

	hpsa_cmd_resolve_and_free(h, c);

	if (cmd && cmd->scsi_done)

		cmd->scsi_done(cmd);

	if (cmd)

		scsi_done(cmd);

}



static void hpsa_retry_cmd(struct ctlr_info *h, struct CommandList *c)
@@ -5671,7 +5671,7 @@ static void hpsa_command_resubmit_worker(struct work_struct *work) 
		 * if it encountered a dma mapping failure.

		 */

		cmd->result = DID_IMM_RETRY << 16;

		cmd->scsi_done(cmd);

		scsi_done(cmd);

	}

}
@@ -5691,19 +5691,19 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd) 
	dev = cmd->device->hostdata;

	if (!dev) {

		cmd->result = DID_NO_CONNECT << 16;

		cmd->scsi_done(cmd);

		scsi_done(cmd);

		return 0;

	}



	if (dev->removed) {

		cmd->result = DID_NO_CONNECT << 16;

		cmd->scsi_done(cmd);

		scsi_done(cmd);

		return 0;

	}



	if (unlikely(lockup_detected(h))) {

		cmd->result = DID_NO_CONNECT << 16;

		cmd->scsi_done(cmd);

		scsi_done(cmd);

		return 0;

	}