scsi: hisi_sas: Stop returning error code from slot_complete_vX_hw()

The error codes are never checked, stop returning them.

Link: https://lore.kernel.org/r/1589552025-165012-5-git-send-email-john.garry@huawei.com
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index c205bff20943cab49c991250ae4f68f70c4aa624..2e1718f9ade218527ef4e1b15142a658143a68e8 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1175,15 +1175,14 @@ static void slot_err_v1_hw(struct hisi_hba *hisi_hba,
 
 }
 
-static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
-                              struct hisi_sas_slot *slot)
+static void slot_complete_v1_hw(struct hisi_hba *hisi_hba,
+                               struct hisi_sas_slot *slot)
 {
        struct sas_task *task = slot->task;
        struct hisi_sas_device *sas_dev;
        struct device *dev = hisi_hba->dev;
        struct task_status_struct *ts;
        struct domain_device *device;
-       enum exec_status sts;
        struct hisi_sas_complete_v1_hdr *complete_queue =
                        hisi_hba->complete_hdr[slot->cmplt_queue];
        struct hisi_sas_complete_v1_hdr *complete_hdr;
@@ -1194,7 +1193,7 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
        cmplt_hdr_data = le32_to_cpu(complete_hdr->data);
 
        if (unlikely(!task || !task->lldd_task || !task->dev))
-               return -EINVAL;
+               return;
 
        ts = &task->task_status;
        device = task->dev;
@@ -1260,7 +1259,7 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
 
                slot_err_v1_hw(hisi_hba, task, slot);
                if (unlikely(slot->abort))
-                       return ts->stat;
+                       return;
                goto out;
        }
 
@@ -1309,12 +1308,9 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
 
 out:
        hisi_sas_slot_task_free(hisi_hba, task, slot);
-       sts = ts->stat;
 
        if (task->task_done)
                task->task_done(task);
-
-       return sts;
 }
 
 /* Interrupts */

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index c725cffe141e8263a564b41e8aaa099ad28258be..e7e7849a4c14e21a1a5bdd18b8dd98525ace7ec8 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2318,8 +2318,8 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
        }
 }
 
-static int
-slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
+static void slot_complete_v2_hw(struct hisi_hba *hisi_hba,
+                               struct hisi_sas_slot *slot)
 {
        struct sas_task *task = slot->task;
        struct hisi_sas_device *sas_dev;
@@ -2327,7 +2327,6 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        struct task_status_struct *ts;
        struct domain_device *device;
        struct sas_ha_struct *ha;
-       enum exec_status sts;
        struct hisi_sas_complete_v2_hdr *complete_queue =
                        hisi_hba->complete_hdr[slot->cmplt_queue];
        struct hisi_sas_complete_v2_hdr *complete_hdr =
@@ -2337,7 +2336,7 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        u32 dw0;
 
        if (unlikely(!task || !task->lldd_task || !task->dev))
-               return -EINVAL;
+               return;
 
        ts = &task->task_status;
        device = task->dev;
@@ -2406,7 +2405,7 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
                                 error_info[2], error_info[3]);
 
                if (unlikely(slot->abort))
-                       return ts->stat;
+                       return;
                goto out;
        }
 
@@ -2456,12 +2455,11 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        }
 
 out:
-       sts = ts->stat;
        spin_lock_irqsave(&task->task_state_lock, flags);
        if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
                spin_unlock_irqrestore(&task->task_state_lock, flags);
                dev_info(dev, "slot complete: task(%pK) aborted\n", task);
-               return SAS_ABORTED_TASK;
+               return;
        }
        task->task_state_flags |= SAS_TASK_STATE_DONE;
        spin_unlock_irqrestore(&task->task_state_lock, flags);
@@ -2473,15 +2471,13 @@ out:
                        spin_unlock_irqrestore(&device->done_lock, flags);
                        dev_info(dev, "slot complete: task(%pK) ignored\n",
                                 task);
-                       return sts;
+                       return;
                }
                spin_unlock_irqrestore(&device->done_lock, flags);
        }
 
        if (task->task_done)
                task->task_done(task);
-
-       return sts;
 }
 
 static void prep_ata_v2_hw(struct hisi_hba *hisi_hba,

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index ec5014baffeba8188f101dc4108bf4c0d8087c87..3e6b78a1f993b9ae373c685c85897a813fa3357c 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2156,8 +2156,8 @@ slot_err_v3_hw(struct hisi_hba *hisi_hba, struct sas_task *task,
        }
 }
 
-static int
-slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
+static void slot_complete_v3_hw(struct hisi_hba *hisi_hba,
+                               struct hisi_sas_slot *slot)
 {
        struct sas_task *task = slot->task;
        struct hisi_sas_device *sas_dev;
@@ -2165,7 +2165,6 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        struct task_status_struct *ts;
        struct domain_device *device;
        struct sas_ha_struct *ha;
-       enum exec_status sts;
        struct hisi_sas_complete_v3_hdr *complete_queue =
                        hisi_hba->complete_hdr[slot->cmplt_queue];
        struct hisi_sas_complete_v3_hdr *complete_hdr =
@@ -2175,7 +2174,7 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        u32 dw0, dw1, dw3;
 
        if (unlikely(!task || !task->lldd_task || !task->dev))
-               return -EINVAL;
+               return;
 
        ts = &task->task_status;
        device = task->dev;
@@ -2237,7 +2236,7 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
                                 error_info[0], error_info[1],
                                 error_info[2], error_info[3]);
                if (unlikely(slot->abort))
-                       return ts->stat;
+                       return;
                goto out;
        }
 
@@ -2282,12 +2281,11 @@ slot_complete_v3_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot)
        }
 
 out:
-       sts = ts->stat;
        spin_lock_irqsave(&task->task_state_lock, flags);
        if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
                spin_unlock_irqrestore(&task->task_state_lock, flags);
                dev_info(dev, "slot complete: task(%pK) aborted\n", task);
-               return SAS_ABORTED_TASK;
+               return;
        }
        task->task_state_flags |= SAS_TASK_STATE_DONE;
        spin_unlock_irqrestore(&task->task_state_lock, flags);
@@ -2299,15 +2297,13 @@ out:
                        spin_unlock_irqrestore(&device->done_lock, flags);
                        dev_info(dev, "slot complete: task(%pK) ignored\n ",
                                 task);
-                       return sts;
+                       return;
                }
                spin_unlock_irqrestore(&device->done_lock, flags);
        }
 
        if (task->task_done)
                task->task_done(task);
-
-       return sts;
 }
 
 static irqreturn_t  cq_thread_v3_hw(int irq_no, void *p)