irqchip: Remove dev_err() usage after platform_get_irq()

We don't need dev_err() messages when platform_get_irq() fails now that
platform_get_irq() prints an error message itself when something goes
wrong. Let's remove these prints with a simple semantic patch.

// <smpl>
@@
expression ret;
struct platform_device *E;
@@

ret =
(
platform_get_irq(E, ...)
|
platform_get_irq_byname(E, ...)
);

if ( \( ret < 0 \| ret <= 0 \) )
{
(
-if (ret != -EPROBE_DEFER)
-{ ...
-dev_err(...);
-... }
|
...
-dev_err(...);
)
...
}
// </smpl>

While we're here, remove braces on if statements that only have one
statement (manually).

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/drivers/irqchip/irq-imgpdc.c b/drivers/irqchip/irq-imgpdc.c
index d00489a..698d07f 100644 (file)
--- a/drivers/irqchip/irq-imgpdc.c
+++ b/drivers/irqchip/irq-imgpdc.c
@@ -362,10 +362,8 @@ static int pdc_intc_probe(struct platform_device *pdev)
        }
        for (i = 0; i < priv->nr_perips; ++i) {
                irq = platform_get_irq(pdev, 1 + i);
-               if (irq < 0) {
-                       dev_err(&pdev->dev, "cannot find perip IRQ #%u\n", i);
+               if (irq < 0)
                        return irq;
-               }
                priv->perip_irqs[i] = irq;
        }
        /* check if too many were provided */
@@ -376,10 +374,8 @@ static int pdc_intc_probe(struct platform_device *pdev)
 
        /* Get syswake IRQ number */
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "cannot find syswake IRQ\n");
+       if (irq < 0)
                return irq;
-       }
        priv->syswake_irq = irq;
 
        /* Set up an IRQ domain */

diff --git a/drivers/irqchip/irq-keystone.c b/drivers/irqchip/irq-keystone.c
index efbcf84..8118ebe 100644 (file)
--- a/drivers/irqchip/irq-keystone.c
+++ b/drivers/irqchip/irq-keystone.c
@@ -164,10 +164,8 @@ static int keystone_irq_probe(struct platform_device *pdev)
        }
 
        kirq->irq = platform_get_irq(pdev, 0);
-       if (kirq->irq < 0) {
-               dev_err(dev, "no irq resource %d\n", kirq->irq);
+       if (kirq->irq < 0)
                return kirq->irq;
-       }
 
        kirq->dev = dev;
        kirq->mask = ~0x0;

diff --git a/drivers/irqchip/qcom-irq-combiner.c b/drivers/irqchip/qcom-irq-combiner.c
index d88e993..abfe592 100644 (file)
--- a/drivers/irqchip/qcom-irq-combiner.c
+++ b/drivers/irqchip/qcom-irq-combiner.c
@@ -248,10 +248,8 @@ static int __init combiner_probe(struct platform_device *pdev)
                return err;
 
        combiner->parent_irq = platform_get_irq(pdev, 0);
-       if (combiner->parent_irq <= 0) {
-               dev_err(&pdev->dev, "Error getting IRQ resource\n");
+       if (combiner->parent_irq <= 0)
                return -EPROBE_DEFER;
-       }
 
        combiner->domain = irq_domain_create_linear(pdev->dev.fwnode, combiner->nirqs,
                                                    &domain_ops, combiner);