PCI: Remove dev_err() when handing an error from platform_get_irq()

There is no need to call the dev_err() function directly to print a
custom message when handling an error from either the platform_get_irq() or
platform_get_irq_byname() functions as both are going to display an
appropriate error message in case of a failure.

This change is as per suggestions from Coccinelle, e.g.,

  drivers/pci/controller/dwc/pcie-armada8k.c:252:2-9: line 252 is
  redundant because platform_get_irq() already prints an error

[bhelgaas: squashed into one commit]
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20200802142601.1635926-2-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-3-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-4-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-5-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-6-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-7-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-8-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-9-kw@linux.com
Link: https://lore.kernel.org/r/20200802142601.1635926-10-kw@linux.com
Link: https://lore.kernel.org/r/20200803071040.1663662-1-kw@linux.com
Signed-off-by: Krzysztof Wilczyński <kw@linux.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ley Foon Tan <ley.foon.tan@intel.com> # altera
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> # dwc

diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
index 6184ebc9392db39ad001c640ee15a3bb082059d3..66465dd698584edcafbe68f86d65bd9ebfe612a1 100644 (file)
--- a/drivers/pci/controller/dwc/pci-dra7xx.c
+++ b/drivers/pci/controller/dwc/pci-dra7xx.c
@@ -629,10 +629,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
        struct resource *res;
 
        pp->irq = platform_get_irq(pdev, 1);
-       if (pp->irq < 0) {
-               dev_err(dev, "missing IRQ resource\n");
+       if (pp->irq < 0)
                return pp->irq;
-       }
 
        ret = dra7xx_pcie_init_irq_domain(pp);
        if (ret < 0)
@@ -871,10 +869,8 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
        pci->ops = &dw_pcie_ops;
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "missing IRQ resource: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        base = devm_platform_ioremap_resource_byname(pdev, "ti_conf");
        if (IS_ERR(base))

diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c
index c5043d951e8095dffbbab14238b520f1fe86ce7e..f721fddc521e6f5d9d8fabd2a0b46b5fbb019961 100644 (file)
--- a/drivers/pci/controller/dwc/pci-exynos.c
+++ b/drivers/pci/controller/dwc/pci-exynos.c
@@ -402,10 +402,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
        int ret;
 
        pp->irq = platform_get_irq(pdev, 1);
-       if (pp->irq < 0) {
-               dev_err(dev, "failed to get irq\n");
+       if (pp->irq < 0)
                return pp->irq;
-       }
+
        ret = devm_request_irq(dev, pp->irq, exynos_pcie_irq_handler,
                                IRQF_SHARED, "exynos-pcie", ep);
        if (ret) {
@@ -415,10 +414,8 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                pp->msi_irq = platform_get_irq(pdev, 0);
-               if (pp->msi_irq < 0) {
-                       dev_err(dev, "failed to get msi irq\n");
+               if (pp->msi_irq < 0)
                        return pp->msi_irq;
-               }
        }
 
        pp->ops = &exynos_pcie_host_ops;

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 8f08ae53f53e4b13f62a671eec74f949d4086a5f..aba0a1514a86dfd54b7bc4b52dd09bf3d5abf33b 100644 (file)
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -868,10 +868,8 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                pp->msi_irq = platform_get_irq_byname(pdev, "msi");
-               if (pp->msi_irq < 0) {
-                       dev_err(dev, "failed to get MSI irq\n");
+               if (pp->msi_irq < 0)
                        return pp->msi_irq;
-               }
        }
 
        pp->ops = &imx6_pcie_host_ops;

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 790679fdfa488cf727c7c8c14dc334fac16062a4..99df9aeece1f2b5eb4d38ca6ff3699aded9e4f57 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -1250,10 +1250,8 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
        pci->version = version;
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "missing IRQ resource: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        ret = request_irq(irq, ks_pcie_err_irq_handler, IRQF_SHARED,
                          "ks-pcie-error-irq", ks_pcie);

diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c
index ca59ba9e0ecd33113535637e2ec29da3678457c7..4f183b96afbbfe2de9bb79fac7d95c7a691d9676 100644 (file)
--- a/drivers/pci/controller/dwc/pci-meson.c
+++ b/drivers/pci/controller/dwc/pci-meson.c
@@ -488,10 +488,8 @@ static int meson_add_pcie_port(struct meson_pcie *mp,
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                pp->msi_irq = platform_get_irq(pdev, 0);
-               if (pp->msi_irq < 0) {
-                       dev_err(dev, "failed to get MSI IRQ\n");
+               if (pp->msi_irq < 0)
                        return pp->msi_irq;
-               }
        }
 
        pp->ops = &meson_pcie_host_ops;

diff --git a/drivers/pci/controller/dwc/pcie-armada8k.c b/drivers/pci/controller/dwc/pcie-armada8k.c
index 49596547e8c297d056fb49d12e0e1cce011760ba..66ec21cd9487fc8b398e6ea1f4099127c010604a 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-armada8k.c
+++ b/drivers/pci/controller/dwc/pcie-armada8k.c
@@ -248,10 +248,8 @@ static int armada8k_add_pcie_port(struct armada8k_pcie *pcie,
        pp->ops = &armada8k_pcie_host_ops;
 
        pp->irq = platform_get_irq(pdev, 0);
-       if (pp->irq < 0) {
-               dev_err(dev, "failed to get irq for port\n");
+       if (pp->irq < 0)
                return pp->irq;
-       }
 
        ret = devm_request_irq(dev, pp->irq, armada8k_pcie_irq_handler,
                               IRQF_SHARED, "armada8k-pcie", pcie);

diff --git a/drivers/pci/controller/dwc/pcie-artpec6.c b/drivers/pci/controller/dwc/pcie-artpec6.c
index 28d5a10952000e45c8d94286b7a66da0bb133e5f..d429bd2b2406623550d9ae01064f27a309e9c131 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-artpec6.c
+++ b/drivers/pci/controller/dwc/pcie-artpec6.c
@@ -387,10 +387,8 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                pp->msi_irq = platform_get_irq_byname(pdev, "msi");
-               if (pp->msi_irq < 0) {
-                       dev_err(dev, "failed to get MSI irq\n");
+               if (pp->msi_irq < 0)
                        return pp->msi_irq;
-               }
        }
 
        pp->ops = &artpec6_pcie_host_ops;

diff --git a/drivers/pci/controller/dwc/pcie-histb.c b/drivers/pci/controller/dwc/pcie-histb.c
index 811b5c6d62eae26a7d5991fb88aee61e5cc965ab..006437eadc314b6896041259e51d86b148b5d98a 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-histb.c
+++ b/drivers/pci/controller/dwc/pcie-histb.c
@@ -402,10 +402,8 @@ static int histb_pcie_probe(struct platform_device *pdev)
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                pp->msi_irq = platform_get_irq_byname(pdev, "msi");
-               if (pp->msi_irq < 0) {
-                       dev_err(dev, "Failed to get MSI IRQ\n");
+               if (pp->msi_irq < 0)
                        return pp->msi_irq;
-               }
        }
 
        hipcie->phy = devm_phy_get(dev, "phy");

diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c
index c19617a912bd577a1717f7b29c932ea03be0e6ef..2e0181ce68957b4d3505f542dff8d5e5fd43af71 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-kirin.c
+++ b/drivers/pci/controller/dwc/pcie-kirin.c
@@ -455,11 +455,8 @@ static int kirin_pcie_add_msi(struct dw_pcie *pci,
 
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                irq = platform_get_irq(pdev, 0);
-               if (irq < 0) {
-                       dev_err(&pdev->dev,
-                               "failed to get MSI IRQ (%d)\n", irq);
+               if (irq < 0)
                        return irq;
-               }
 
                pci->pp.msi_irq = irq;
        }

diff --git a/drivers/pci/controller/dwc/pcie-spear13xx.c b/drivers/pci/controller/dwc/pcie-spear13xx.c
index 7d0cdfd8138b9a7b8d03e675c28b87c6c46c8eb4..ad5d08d199268064c9fec9f02787aa57e0d24113 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-spear13xx.c
+++ b/drivers/pci/controller/dwc/pcie-spear13xx.c
@@ -198,10 +198,9 @@ static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie,
        int ret;
 
        pp->irq = platform_get_irq(pdev, 0);
-       if (pp->irq < 0) {
-               dev_err(dev, "failed to get irq\n");
+       if (pp->irq < 0)
                return pp->irq;
-       }
+
        ret = devm_request_irq(dev, pp->irq, spear13xx_pcie_irq_handler,
                               IRQF_SHARED | IRQF_NO_THREAD,
                               "spear1340-pcie", spear13xx_pcie);

diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
index 92b77f7d83546a98730681a7de1cbe89703ea4d9..70498689d0c0a162d78b68b0ace8478e0b30e26e 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -2189,10 +2189,8 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
        }
 
        pp->irq = platform_get_irq_byname(pdev, "intr");
-       if (pp->irq < 0) {
-               dev_err(dev, "Failed to get \"intr\" interrupt\n");
+       if (pp->irq < 0)
                return pp->irq;
-       }
 
        pcie->bpmp = tegra_bpmp_get(dev);
        if (IS_ERR(pcie->bpmp))

diff --git a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
index a6d2190a67531821dd626e6b47b4ef30d1705cf5..ee0156921ebcb9edeb94848e83ed1915de9685bb 100644 (file)
--- a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
+++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c
@@ -170,10 +170,9 @@ static int ls_pcie_g4_interrupt_init(struct mobiveil_pcie *mv_pci)
        int ret;
 
        pcie->irq = platform_get_irq_byname(pdev, "intr");
-       if (pcie->irq < 0) {
-               dev_err(dev, "Can't get 'intr' IRQ, errno = %d\n", pcie->irq);
+       if (pcie->irq < 0)
                return pcie->irq;
-       }
+
        ret = devm_request_irq(dev, pcie->irq, ls_pcie_g4_isr,
                               IRQF_SHARED, pdev->name, pcie);
        if (ret) {

diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
index 5907baa9b1f21e78ac417792b45316cf9b226681..fa321fcdd4bc8097a5f3be48098f47d852aeb1a8 100644 (file)
--- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
+++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c
@@ -522,10 +522,8 @@ static int mobiveil_pcie_integrated_interrupt_init(struct mobiveil_pcie *pcie)
        mobiveil_pcie_enable_msi(pcie);
 
        rp->irq = platform_get_irq(pdev, 0);
-       if (rp->irq < 0) {
-               dev_err(dev, "failed to map IRQ: %d\n", rp->irq);
+       if (rp->irq < 0)
                return rp->irq;
-       }
 
        /* initialize the IRQ domains */
        ret = mobiveil_pcie_init_irq_domain(pcie);

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index 235b456698fc791a96f51a4bf376913666581b5d..b11397475a4da4efaf18cf08535e131699d6d735 100644 (file)
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -1520,10 +1520,8 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie)
 
        /* request interrupt */
        err = platform_get_irq_byname(pdev, "intr");
-       if (err < 0) {
-               dev_err(dev, "failed to get IRQ: %d\n", err);
+       if (err < 0)
                goto phys_put;
-       }
 
        pcie->irq = err;
 
@@ -1738,10 +1736,8 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
        }
 
        err = platform_get_irq_byname(pdev, "msi");
-       if (err < 0) {
-               dev_err(dev, "failed to get IRQ: %d\n", err);
+       if (err < 0)
                goto free_irq_domain;
-       }
 
        msi->irq = err;
 

diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
index 3681e5af387853c52ffe10cec2c0020b629bcaf1..2a19f2a9894530581a9454251846cc5d1c9dcb47 100644 (file)
--- a/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@ -777,10 +777,9 @@ static int v3_pci_probe(struct platform_device *pdev)
 
        /* Get and request error IRQ resource */
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "unable to obtain PCIv3 error IRQ\n");
+       if (irq < 0)
                return irq;
-       }
+
        ret = devm_request_irq(dev, irq, v3_irq, 0,
                        "PCIv3 error", v3);
        if (ret < 0) {

diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c
index f4c02da84e599770ed538dcac69db5bdfbe92a94..02271c6d17a1126c358dccc169b65f6cfcb83828 100644 (file)
--- a/drivers/pci/controller/pci-xgene-msi.c
+++ b/drivers/pci/controller/pci-xgene-msi.c
@@ -478,8 +478,6 @@ static int xgene_msi_probe(struct platform_device *pdev)
        for (irq_index = 0; irq_index < NR_HW_IRQS; irq_index++) {
                virt_msir = platform_get_irq(pdev, irq_index);
                if (virt_msir < 0) {
-                       dev_err(&pdev->dev, "Cannot translate IRQ index %d\n",
-                               irq_index);
                        rc = virt_msir;
                        goto error;
                }

diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c
index 16d938920ca57a7162d805a182fa9b0d67a0e3a2..bec666eda1eb1488ca4f1cfc8a38b439bfc395b3 100644 (file)
--- a/drivers/pci/controller/pcie-altera-msi.c
+++ b/drivers/pci/controller/pcie-altera-msi.c
@@ -256,7 +256,6 @@ static int altera_msi_probe(struct platform_device *pdev)
 
        msi->irq = platform_get_irq(pdev, 0);
        if (msi->irq < 0) {
-               dev_err(&pdev->dev, "failed to map IRQ: %d\n", msi->irq);
                ret = msi->irq;
                goto err;
        }

diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
index 24cb1c331058473579d66954e0eb016054c447e0..f6d73d282230f8911dfbe8286f092e5715d592b8 100644 (file)
--- a/drivers/pci/controller/pcie-altera.c
+++ b/drivers/pci/controller/pcie-altera.c
@@ -713,10 +713,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)
 
        /* setup IRQ */
        pcie->irq = platform_get_irq(pdev, 0);
-       if (pcie->irq < 0) {
-               dev_err(dev, "failed to get IRQ: %d\n", pcie->irq);
+       if (pcie->irq < 0)
                return pcie->irq;
-       }
 
        irq_set_chained_handler_and_data(pcie->irq, altera_pcie_isr, pcie);
        return 0;

diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index 94af6f5828a3dd2885b5f9ba6372d7637b8490bc..eebe05ab354fd8ea7e492f617befd5c2603bcad1 100644 (file)
--- 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);

diff --git a/drivers/pci/controller/pcie-tango.c b/drivers/pci/controller/pcie-tango.c
index 8f640c70f936924a8285e5ee21764cf8bd4dfb98..d093a8ce4bb17ef22b37e9fc4958cee94069fe2e 100644 (file)
--- a/drivers/pci/controller/pcie-tango.c
+++ b/drivers/pci/controller/pcie-tango.c
@@ -273,10 +273,8 @@ static int tango_pcie_probe(struct platform_device *pdev)
                writel_relaxed(0, pcie->base + SMP8759_ENABLE + offset);
 
        virq = platform_get_irq(pdev, 1);
-       if (virq < 0) {
-               dev_err(dev, "Failed to map IRQ\n");
+       if (virq < 0)
                return virq;
-       }
 
        irq_dom = irq_domain_create_linear(fwnode, MSI_MAX, &dom_ops, pcie);
        if (!irq_dom) {

diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
index 9bd1427f2fd6d8cf0fff1f6515c7c62a411b91ad..55489b72848457f1cd14ec6b2736bfea01d41e0e 100644 (file)
--- a/drivers/pci/controller/pcie-xilinx-nwl.c
+++ b/drivers/pci/controller/pcie-xilinx-nwl.c
@@ -586,7 +586,6 @@ static int nwl_pcie_enable_msi(struct nwl_pcie *pcie)
        /* Get msi_1 IRQ number */
        msi->irq_msi1 = platform_get_irq_byname(pdev, "msi1");
        if (msi->irq_msi1 < 0) {
-               dev_err(dev, "failed to get IRQ#%d\n", msi->irq_msi1);
                ret = -EINVAL;
                goto err;
        }
@@ -597,7 +596,6 @@ static int nwl_pcie_enable_msi(struct nwl_pcie *pcie)
        /* Get msi_0 IRQ number */
        msi->irq_msi0 = platform_get_irq_byname(pdev, "msi0");
        if (msi->irq_msi0 < 0) {
-               dev_err(dev, "failed to get IRQ#%d\n", msi->irq_msi0);
                ret = -EINVAL;
                goto err;
        }
@@ -728,11 +726,8 @@ static int nwl_pcie_bridge_init(struct nwl_pcie *pcie)
 
        /* Get misc IRQ number */
        pcie->irq_misc = platform_get_irq_byname(pdev, "misc");
-       if (pcie->irq_misc < 0) {
-               dev_err(dev, "failed to get misc IRQ %d\n",
-                       pcie->irq_misc);
+       if (pcie->irq_misc < 0)
                return -EINVAL;
-       }
 
        err = devm_request_irq(dev, pcie->irq_misc,
                               nwl_pcie_misc_handler, IRQF_SHARED,
@@ -797,10 +792,8 @@ static int nwl_pcie_parse_dt(struct nwl_pcie *pcie,
 
        /* Get intx IRQ number */
        pcie->irq_intx = platform_get_irq_byname(pdev, "intx");
-       if (pcie->irq_intx < 0) {
-               dev_err(dev, "failed to get intx IRQ %d\n", pcie->irq_intx);
+       if (pcie->irq_intx < 0)
                return pcie->irq_intx;
-       }
 
        irq_set_chained_handler_and_data(pcie->irq_intx,
                                         nwl_pcie_leg_handler, pcie);