]> git.baikalelectronics.ru Git - kernel.git/commitdiff
scsi: 3w-sas: Call scsi_done() directly
authorBart Van Assche <bvanassche@acm.org>
Thu, 7 Oct 2021 20:28:04 +0000 (13:28 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sun, 17 Oct 2021 01:28:44 +0000 (21:28 -0400)
Conditional statements are faster than indirect calls. Hence call
scsi_done() directly.

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

index 4fde39da54e4ea74016534e25f698480aacff533..e6f51904f5b1e4bb66e2a41bca52cfe875bb216f 100644 (file)
@@ -1216,7 +1216,7 @@ static irqreturn_t twl_interrupt(int irq, void *dev_instance)
 
                        /* Now complete the io */
                        scsi_dma_unmap(cmd);
-                       cmd->scsi_done(cmd);
+                       scsi_done(cmd);
                        tw_dev->state[request_id] = TW_S_COMPLETED;
                        twl_free_request_id(tw_dev, request_id);
                        tw_dev->posted_request_count--;
@@ -1369,7 +1369,7 @@ static int twl_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_res
                        if (cmd) {
                                cmd->result = (DID_RESET << 16);
                                scsi_dma_unmap(cmd);
-                               cmd->scsi_done(cmd);
+                               scsi_done(cmd);
                        }
                }
        }
@@ -1461,9 +1461,6 @@ static int twl_scsi_queue_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_
                goto out;
        }
 
-       /* Save done function into scsi_cmnd struct */
-       SCpnt->scsi_done = done;
-
        /* Get a free request id */
        twl_get_request_id(tw_dev, &request_id);