scsi: hpsa: Call scsi_done() directly
authorBart Van Assche <bvanassche@acm.org>
Thu, 7 Oct 2021 20:28:31 +0000 (13:28 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sun, 17 Oct 2021 01:28:47 +0000 (21:28 -0400)
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: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hpsa.c

index 3faa87fa296a2df10ab5c1b56158af4dd2222627..a1153449344ab9c1d982caa00bcd337012012730 100644 (file)
@@ -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;
        }