scsi: aic7xxx: Call scsi_done() directly

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

Link: https://lore.kernel.org/r/20211007202923.2174984-22-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/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 92ea24a075b8004adfc7870af4f48de1d9857552..af49c32cfaf7cbb4fc07ed46e89cc28314909bcb 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -581,7 +581,6 @@ ahd_linux_queue_lck(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd
 
        ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
 
-       cmd->scsi_done = scsi_done;
        cmd->result = CAM_REQ_INPROG << 16;
        rtn = ahd_linux_run_command(ahd, dev, cmd);
 
@@ -2111,7 +2110,7 @@ ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, struct scsi_cmnd *cmd)
 
        ahd_cmd_set_transaction_status(cmd, new_status);
 
-       cmd->scsi_done(cmd);
+       scsi_done(cmd);
 }
 
 static void

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 8b3d472aa3cca26b34abf237d099c40efe0c8e28..f2daca41f3f2157bbb0dcb5ad421bb3cd92b063f 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -530,7 +530,6 @@ ahc_linux_queue_lck(struct scsi_cmnd * cmd, void (*scsi_done) (struct scsi_cmnd
 
        ahc_lock(ahc, &flags);
        if (ahc->platform_data->qfrozen == 0) {
-               cmd->scsi_done = scsi_done;
                cmd->result = CAM_REQ_INPROG << 16;
                rtn = ahc_linux_run_command(ahc, dev, cmd);
        }
@@ -1986,7 +1985,7 @@ ahc_linux_queue_cmd_complete(struct ahc_softc *ahc, struct scsi_cmnd *cmd)
                ahc_cmd_set_transaction_status(cmd, new_status);
        }
 
-       cmd->scsi_done(cmd);
+       scsi_done(cmd);
 }
 
 static void