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

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

index ce1ba1b..7bfa023 100644 (file)
@@ -643,7 +643,7 @@ static void pvscsi_complete_request(struct pvscsi_adapter *adapter,
                "cmd=%p %x ctx=%p result=0x%x status=0x%x,%x\n",
                cmd, cmd->cmnd[0], ctx, cmd->result, btstat, sdstat);
 
-       cmd->scsi_done(cmd);
+       scsi_done(cmd);
 }
 
 /*
@@ -786,7 +786,6 @@ static int pvscsi_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd
                return SCSI_MLQUEUE_HOST_BUSY;
        }
 
-       cmd->scsi_done = done;
        op = cmd->cmnd[0];
 
        dev_dbg(&cmd->device->sdev_gendev,
@@ -860,7 +859,7 @@ static int pvscsi_abort(struct scsi_cmnd *cmd)
         * Successfully aborted the command.
         */
        cmd->result = (DID_ABORT << 16);
-       cmd->scsi_done(cmd);
+       scsi_done(cmd);
 
 out:
        spin_unlock_irqrestore(&adapter->hw_lock, flags);
@@ -887,7 +886,7 @@ static void pvscsi_reset_all(struct pvscsi_adapter *adapter)
                        pvscsi_patch_sense(cmd);
                        pvscsi_release_context(adapter, ctx);
                        cmd->result = (DID_RESET << 16);
-                       cmd->scsi_done(cmd);
+                       scsi_done(cmd);
                }
        }
 }