scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw()

[ Upstream commit ab17122e758ef68fb21033e25c041144067975f5 ]

After commit 6c11dc060427 ("scsi: hisi_sas: Fix IRQ checks") we have the
error codes returned by platform_get_irq() ready for the propagation
upsream in interrupt_init_v1_hw() -- that will fix still broken deferred
probing. Let's propagate the error codes from devm_request_irq() as well
since I don't see the reason to override them with -ENOENT...

Link: https://lore.kernel.org/r/49ba93a3-d427-7542-d85a-b74fe1a33a73@omp.ru
Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 6c2a97f..2e529d6 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1647,7 +1647,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                        if (irq < 0) {
                                dev_err(dev, "irq init: fail map phy interrupt %d\n",
                                        idx);
-                               return -ENOENT;
+                               return irq;
                        }
 
                        rc = devm_request_irq(dev, irq, phy_interrupts[j], 0,
@@ -1655,7 +1655,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                        if (rc) {
                                dev_err(dev, "irq init: could not request phy interrupt %d, rc=%d\n",
                                        irq, rc);
-                               return -ENOENT;
+                               return rc;
                        }
                }
        }
@@ -1666,7 +1666,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                if (irq < 0) {
                        dev_err(dev, "irq init: could not map cq interrupt %d\n",
                                idx);
-                       return -ENOENT;
+                       return irq;
                }
 
                rc = devm_request_irq(dev, irq, cq_interrupt_v1_hw, 0,
@@ -1674,7 +1674,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                if (rc) {
                        dev_err(dev, "irq init: could not request cq interrupt %d, rc=%d\n",
                                irq, rc);
-                       return -ENOENT;
+                       return rc;
                }
        }
 
@@ -1684,7 +1684,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                if (irq < 0) {
                        dev_err(dev, "irq init: could not map fatal interrupt %d\n",
                                idx);
-                       return -ENOENT;
+                       return irq;
                }
 
                rc = devm_request_irq(dev, irq, fatal_interrupts[i], 0,
@@ -1692,7 +1692,7 @@ static int interrupt_init_v1_hw(struct hisi_hba *hisi_hba)
                if (rc) {
                        dev_err(dev, "irq init: could not request fatal interrupt %d, rc=%d\n",
                                irq, rc);
-                       return -ENOENT;
+                       return rc;
                }
        }