clocksource: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
index 8e12b11e81b096b77c8bcc6c9eca0cc0a3c5c240..9039df4f90e2bd6caa58ee6848c8a48ebec7d365 100644 (file)
--- a/drivers/clocksource/em_sti.c
+++ b/drivers/clocksource/em_sti.c
@@ -291,10 +291,8 @@ static int em_sti_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, p);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get irq\n");
+       if (irq < 0)
                return irq;
-       }
 
        /* map memory, let base point to the STI instance */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 55d3e03f2cd4fefa02ed8be70aa96c7472687eeb..f6424b61e212a03c42047a116b4ae118a890de4e 100644 (file)
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -776,11 +776,8 @@ static int sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
        int ret;
 
        irq = platform_get_irq(ch->cmt->pdev, ch->index);
-       if (irq < 0) {
-               dev_err(&ch->cmt->pdev->dev, "ch%u: failed to get irq\n",
-                       ch->index);
+       if (irq < 0)
                return irq;
-       }
 
        ret = request_irq(irq, sh_cmt_interrupt,
                          IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,

diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 49f1c805fc9598edf5d7021b435419b40e24b64f..8c4f3753b36ecbec88cb4be5091264e44f6a1934 100644 (file)
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -462,11 +462,8 @@ static int sh_tmu_channel_setup(struct sh_tmu_channel *ch, unsigned int index,
                ch->base = tmu->mapbase + 8 + ch->index * 12;
 
        ch->irq = platform_get_irq(tmu->pdev, index);
-       if (ch->irq < 0) {
-               dev_err(&tmu->pdev->dev, "ch%u: failed to get irq\n",
-                       ch->index);
+       if (ch->irq < 0)
                return ch->irq;
-       }
 
        ch->cs_enabled = false;
        ch->enable_count = 0;