scsi: zfcp_scsi: Call scsi_done() directly
authorBart Van Assche <bvanassche@acm.org>
Thu, 7 Oct 2021 20:28:02 +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-8-bvanassche@acm.org
Acked-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/s390/scsi/zfcp_fsf.c
drivers/s390/scsi/zfcp_scsi.c

index c1f9792..4f1e438 100644 (file)
@@ -2501,7 +2501,7 @@ skip_fsfstatus:
        zfcp_dbf_scsi_result(scpnt, req);
 
        scpnt->host_scribble = NULL;
-       (scpnt->scsi_done) (scpnt);
+       scsi_done(scpnt);
        /*
         * We must hold this lock until scsi_done has been called.
         * Otherwise we may call scsi_done after abort regarding this
index 9da9b2b..e0a6d8c 100644 (file)
@@ -60,7 +60,7 @@ static void zfcp_scsi_command_fail(struct scsi_cmnd *scpnt, int result)
 {
        set_host_byte(scpnt, result);
        zfcp_dbf_scsi_fail_send(scpnt);
-       scpnt->scsi_done(scpnt);
+       scsi_done(scpnt);
 }
 
 static
@@ -78,7 +78,7 @@ int zfcp_scsi_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scpnt)
        if (unlikely(scsi_result)) {
                scpnt->result = scsi_result;
                zfcp_dbf_scsi_fail_send(scpnt);
-               scpnt->scsi_done(scpnt);
+               scsi_done(scpnt);
                return 0;
        }