]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
watchdog: rzn1: Use dev_err_probe()
authorHerve Codina (Schneider Electric) <herve.codina@bootlin.com>
Tue, 24 Mar 2026 11:48:45 +0000 (12:48 +0100)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 3 May 2026 15:37:49 +0000 (08:37 -0700)
In the probe() function the following pattern is present several times:
if (err) {
dev_err(dev, ...);
return err;
}

Replace them by dev_err_probe() calls.

Signed-off-by: Herve Codina (Schneider Electric) <herve.codina@bootlin.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20260324114849.242755-3-herve.codina@bootlin.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/watchdog/rzn1_wdt.c

index 96fd04fbc2a267df034648f16572f81af3a3d06e..0b57540692f90c940d50530298bb42f98758612c 100644 (file)
@@ -122,22 +122,16 @@ static int rzn1_wdt_probe(struct platform_device *pdev)
 
        ret = devm_request_irq(dev, irq, rzn1_wdt_irq, 0,
                               np->name, wdt);
-       if (ret) {
-               dev_err(dev, "failed to request irq %d\n", irq);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "failed to request irq %d\n", irq);
 
        clk = devm_clk_get_enabled(dev, NULL);
-       if (IS_ERR(clk)) {
-               dev_err(dev, "failed to get the clock\n");
-               return PTR_ERR(clk);
-       }
+       if (IS_ERR(clk))
+               return dev_err_probe(dev, PTR_ERR(clk), "failed to get the clock\n");
 
        clk_rate = clk_get_rate(clk);
-       if (!clk_rate) {
-               dev_err(dev, "failed to get the clock rate\n");
-               return -EINVAL;
-       }
+       if (!clk_rate)
+               return dev_err_probe(dev, -EINVAL, "failed to get the clock rate\n");
 
        wdt->clk_rate_khz = clk_rate / 1000;
        wdt->wdtdev.info = &rzn1_wdt_info;