scsi: aacraid: Introduce aac_scsi_done()

This patch does not change any functionality but makes the next patch in
this series easier to read.

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

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index c2d6f0a9e0b1866012e134f12b526fc55e9f3a93..40b86acac17b7583e4e623994b80136fb798af98 100644 (file)
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -517,6 +517,11 @@ int aac_get_containers(struct aac_dev *dev)
        return status;
 }
 
+static void aac_scsi_done(struct scsi_cmnd *scmd)
+{
+       scmd->scsi_done(scmd);
+}
+
 static void get_container_name_callback(void *context, struct fib * fibptr)
 {
        struct aac_get_name_resp * get_name_reply;
@@ -558,7 +563,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
        scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD;
 
        aac_fib_complete(fibptr);
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
 }
 
 /*
@@ -614,7 +619,7 @@ static int aac_probe_container_callback2(struct scsi_cmnd * scsicmd)
                return aac_scsi_cmd(scsicmd);
 
        scsicmd->result = DID_NO_CONNECT << 16;
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
        return 0;
 }
 
@@ -1094,7 +1099,7 @@ static void get_container_serial_callback(void *context, struct fib * fibptr)
        scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD;
 
        aac_fib_complete(fibptr);
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
 }
 
 /*
@@ -1197,7 +1202,7 @@ static int aac_bounds_32(struct aac_dev * dev, struct scsi_cmnd * cmd, u64 lba)
                memcpy(cmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                       min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
                             SCSI_SENSE_BUFFERSIZE));
-               cmd->scsi_done(cmd);
+               aac_scsi_done(cmd);
                return 1;
        }
        return 0;
@@ -2392,7 +2397,7 @@ static void io_callback(void *context, struct fib * fibptr)
        }
        aac_fib_complete(fibptr);
 
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
 }
 
 static int aac_read(struct scsi_cmnd * scsicmd)
@@ -2463,7 +2468,7 @@ static int aac_read(struct scsi_cmnd * scsicmd)
                memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                       min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
                             SCSI_SENSE_BUFFERSIZE));
-               scsicmd->scsi_done(scsicmd);
+               aac_scsi_done(scsicmd);
                return 0;
        }
 
@@ -2489,7 +2494,7 @@ static int aac_read(struct scsi_cmnd * scsicmd)
         *      For some reason, the Fib didn't queue, return QUEUE_FULL
         */
        scsicmd->result = DID_OK << 16 | SAM_STAT_TASK_SET_FULL;
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
        aac_fib_complete(cmd_fibcontext);
        aac_fib_free(cmd_fibcontext);
        return 0;
@@ -2554,7 +2559,7 @@ static int aac_write(struct scsi_cmnd * scsicmd)
                memcpy(scsicmd->sense_buffer, &dev->fsa_dev[cid].sense_data,
                       min_t(size_t, sizeof(dev->fsa_dev[cid].sense_data),
                             SCSI_SENSE_BUFFERSIZE));
-               scsicmd->scsi_done(scsicmd);
+               aac_scsi_done(scsicmd);
                return 0;
        }
 
@@ -2580,7 +2585,7 @@ static int aac_write(struct scsi_cmnd * scsicmd)
         *      For some reason, the Fib didn't queue, return QUEUE_FULL
         */
        scsicmd->result = DID_OK << 16 | SAM_STAT_TASK_SET_FULL;
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
 
        aac_fib_complete(cmd_fibcontext);
        aac_fib_free(cmd_fibcontext);
@@ -2621,7 +2626,7 @@ static void synchronize_callback(void *context, struct fib *fibptr)
 
        aac_fib_complete(fibptr);
        aac_fib_free(fibptr);
-       cmd->scsi_done(cmd);
+       aac_scsi_done(cmd);
 }
 
 static int aac_synchronize(struct scsi_cmnd *scsicmd)
@@ -2688,7 +2693,7 @@ static void aac_start_stop_callback(void *context, struct fib *fibptr)
 
        aac_fib_complete(fibptr);
        aac_fib_free(fibptr);
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
 }
 
 static int aac_start_stop(struct scsi_cmnd *scsicmd)
@@ -2702,7 +2707,7 @@ static int aac_start_stop(struct scsi_cmnd *scsicmd)
        if (!(aac->supplement_adapter_info.supported_options2 &
              AAC_OPTION_POWER_MANAGEMENT)) {
                scsicmd->result = DID_OK << 16 | SAM_STAT_GOOD;
-               scsicmd->scsi_done(scsicmd);
+               aac_scsi_done(scsicmd);
                return 0;
        }
 
@@ -3237,7 +3242,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
 
 scsi_done_ret:
 
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
        return 0;
 }
 
@@ -3546,7 +3551,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
        scsicmd->result |= le32_to_cpu(srbreply->scsi_status);
 
        aac_fib_complete(fibptr);
-       scsicmd->scsi_done(scsicmd);
+       aac_scsi_done(scsicmd);
 }
 
 static void hba_resp_task_complete(struct aac_dev *dev,
@@ -3686,7 +3691,7 @@ out:
        if (fibptr->flags & FIB_CONTEXT_FLAG_NATIVE_HBA_TMF)
                scsicmd->SCp.sent_command = 1;
        else
-               scsicmd->scsi_done(scsicmd);
+               aac_scsi_done(scsicmd);
 }
 
 /**
@@ -3706,7 +3711,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)
        if (scmd_id(scsicmd) >= dev->maximum_num_physicals ||
                        scsicmd->device->lun > 7) {
                scsicmd->result = DID_NO_CONNECT << 16;
-               scsicmd->scsi_done(scsicmd);
+               aac_scsi_done(scsicmd);
                return 0;
        }
 
@@ -3747,7 +3752,7 @@ static int aac_send_hba_fib(struct scsi_cmnd *scsicmd)
        if (scmd_id(scsicmd) >= dev->maximum_num_physicals ||
                        scsicmd->device->lun > AAC_MAX_LUN - 1) {
                scsicmd->result = DID_NO_CONNECT << 16;
-               scsicmd->scsi_done(scsicmd);
+               aac_scsi_done(scsicmd);
                return 0;
        }