Commit 26ae6a8e authored Jul 30, 2019 by Stephen Boyd Committed by Wim Van Sebroeck Aug 12, 2019

watchdog: 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: Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

parent 4b4b8b03

drivers/watchdog/sprd_wdt.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -284,10 +284,8 @@ static int sprd_wdt_probe(struct platform_device *pdev)
		}

		wdt->irq = platform_get_irq(pdev, 0);
		if (wdt->irq < 0) {
		dev_err(dev, "failed to get IRQ resource\n");
		if (wdt->irq < 0)
		return wdt->irq;
		}

		ret = devm_request_irq(dev, wdt->irq, sprd_wdt_isr, IRQF_NO_SUSPEND,
		"sprd-wdt", (void *)wdt);