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

scsi: ata: Call scsi_done() directly 

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

Link: https://lore.kernel.org/r/20211007202923.2174984-4-bvanassche@acm.org


Acked-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a710eacb

drivers/ata/libata-sata.c

+1 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap) 
		rc = __ata_scsi_queuecmd(cmd, ap->link.device);

	else {

		cmd->result = (DID_BAD_TARGET << 16);

		cmd->scsi_done(cmd);

		scsi_done(cmd);

	}

	return rc;

}

drivers/ata/libata-scsi.c

+7 −7
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev, 
	qc = ata_qc_new_init(dev, scsi_cmd_to_rq(cmd)->tag);

	if (qc) {

		qc->scsicmd = cmd;

		qc->scsidone = cmd->scsi_done;

		qc->scsidone = scsi_done;



		qc->sg = scsi_sglist(cmd);

		qc->n_elem = scsi_sg_count(cmd);
@@ -643,7 +643,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev, 
			qc->flags |= ATA_QCFLAG_QUIET;

	} else {

		cmd->result = (DID_OK << 16) | SAM_STAT_TASK_SET_FULL;

		cmd->scsi_done(cmd);

		scsi_done(cmd);

	}



	return qc;
@@ -1738,14 +1738,14 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, 


early_finish:

	ata_qc_free(qc);

	cmd->scsi_done(cmd);

	scsi_done(cmd);

	DPRINTK("EXIT - early finish (good or error)\n");

	return 0;



err_did:

	ata_qc_free(qc);

	cmd->result = (DID_ERROR << 16);

	cmd->scsi_done(cmd);

	scsi_done(cmd);

err_mem:

	DPRINTK("EXIT - internal\n");

	return 0;
@@ -4018,7 +4018,7 @@ int __ata_scsi_queuecmd(struct scsi_cmnd *scmd, struct ata_device *dev) 
	DPRINTK("bad CDB len=%u, scsi_op=0x%02x, max=%u\n",

		scmd->cmd_len, scsi_op, dev->cdb_len);

	scmd->result = DID_ERROR << 16;

	scmd->scsi_done(scmd);

	scsi_done(scmd);

	return 0;

}
@@ -4060,7 +4060,7 @@ int ata_scsi_queuecmd(struct Scsi_Host *shost, struct scsi_cmnd *cmd) 
		rc = __ata_scsi_queuecmd(cmd, dev);

	else {

		cmd->result = (DID_BAD_TARGET << 16);

		cmd->scsi_done(cmd);

		scsi_done(cmd);

	}



	spin_unlock_irqrestore(ap->lock, irq_flags);
@@ -4188,7 +4188,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd) 
		break;

	}



	cmd->scsi_done(cmd);

	scsi_done(cmd);

}



int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)