scsi: acornscsi: Call scsi_done() directly
authorBart Van Assche <bvanassche@acm.org>
Thu, 7 Oct 2021 20:28:12 +0000 (13:28 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sun, 17 Oct 2021 01:28:45 +0000 (21:28 -0400)
Conditional statements are faster than indirect calls. Hence call
scsi_done() directly.

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

index 0cc62c1b082544d1b644bc1f4a6c33c7c665f0c9..dadaf5ee0ea99479b60d71a47f48e55d10950e41 100644 (file)
@@ -841,13 +841,10 @@ static void acornscsi_done(AS_Host *host, struct scsi_cmnd **SCpntp,
                }
        }
 
-       if (!SCpnt->scsi_done)
-           panic("scsi%d.H: null scsi_done function in acornscsi_done", host->host->host_no);
-
        clear_bit(SCpnt->device->id * 8 +
                  (u8)(SCpnt->device->lun & 0x7), host->busyluns);
 
-       SCpnt->scsi_done(SCpnt);
+       scsi_done(SCpnt);
     } else
        printk("scsi%d: null command in acornscsi_done", host->host->host_no);
 
@@ -2428,7 +2425,6 @@ static int acornscsi_queuecmd_lck(struct scsi_cmnd *SCpnt,
     }
 #endif
 
-    SCpnt->scsi_done = done;
     SCpnt->host_scribble = NULL;
     SCpnt->result = 0;
     SCpnt->SCp.phase = (int)acornscsi_datadirection(SCpnt->cmnd[0]);