lkml.org 
[lkml]   [2021]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.12 026/104] scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw()
    Date
    From: Sergey Shtylyov <s.shtylyov@omp.ru>

    [ 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>
    ---
    drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
    index 3e359ac752fd..3cba7bfba296 100644
    --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
    +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
    @@ -1649,7 +1649,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,
    @@ -1657,7 +1657,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;
    }
    }
    }
    @@ -1668,7 +1668,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,
    @@ -1676,7 +1676,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;
    }
    }

    @@ -1686,7 +1686,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,
    @@ -1694,7 +1694,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;
    }
    }

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-10 04:40    [W:3.733 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site