diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2020-08-05 18:24:22 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-08-05 18:24:22 -0500 |
commit | 6f119ec8d9c8f68c0432d902312045a699c3e52a (patch) | |
tree | 37a77220c6301b947b778a45e314719e20028a79 /drivers/pci/controller/pcie-rockchip-host.c | |
parent | 65c2bc6ce972e7aee1523a0702d0eeac0570a01f (diff) | |
parent | caecb05c800081c57907749f787f05f62011564e (diff) | |
download | lwn-6f119ec8d9c8f68c0432d902312045a699c3e52a.tar.gz lwn-6f119ec8d9c8f68c0432d902312045a699c3e52a.zip |
Merge branch 'pci/irq-error'
- Remove redundant logging for platform_get_irq() errors (Krzysztof
Wilczyński)
* pci/irq-error:
PCI: Remove dev_err() when handing an error from platform_get_irq()
Diffstat (limited to 'drivers/pci/controller/pcie-rockchip-host.c')
-rw-r--r-- | drivers/pci/controller/pcie-rockchip-host.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c index 153bc95ab29f..0bb2fb3e8a0b 100644 --- a/drivers/pci/controller/pcie-rockchip-host.c +++ b/drivers/pci/controller/pcie-rockchip-host.c @@ -549,10 +549,8 @@ static int rockchip_pcie_setup_irq(struct rockchip_pcie *rockchip) struct platform_device *pdev = to_platform_device(dev); irq = platform_get_irq_byname(pdev, "sys"); - if (irq < 0) { - dev_err(dev, "missing sys IRQ resource\n"); + if (irq < 0) return irq; - } err = devm_request_irq(dev, irq, rockchip_pcie_subsys_irq_handler, IRQF_SHARED, "pcie-sys", rockchip); @@ -562,20 +560,16 @@ static int rockchip_pcie_setup_irq(struct rockchip_pcie *rockchip) } irq = platform_get_irq_byname(pdev, "legacy"); - if (irq < 0) { - dev_err(dev, "missing legacy IRQ resource\n"); + if (irq < 0) return irq; - } irq_set_chained_handler_and_data(irq, rockchip_pcie_legacy_int_handler, rockchip); irq = platform_get_irq_byname(pdev, "client"); - if (irq < 0) { - dev_err(dev, "missing client IRQ resource\n"); + if (irq < 0) return irq; - } err = devm_request_irq(dev, irq, rockchip_pcie_client_irq_handler, IRQF_SHARED, "pcie-client", rockchip); |