watchdog: cadence: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Tue, 1 Sep 2020 15:31:39 +0000 (17:31 +0200)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Wed, 14 Oct 2020 13:02:24 +0000 (15:02 +0200)
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20200901153141.18960-1-krzk@kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/cadence_wdt.c

index 672b184..bc99e91 100644 (file)
@@ -334,12 +334,9 @@ static int cdns_wdt_probe(struct platform_device *pdev)
        watchdog_set_drvdata(cdns_wdt_device, wdt);
 
        wdt->clk = devm_clk_get(dev, NULL);
-       if (IS_ERR(wdt->clk)) {
-               ret = PTR_ERR(wdt->clk);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "input clock not found\n");
-               return ret;
-       }
+       if (IS_ERR(wdt->clk))
+               return dev_err_probe(dev, PTR_ERR(wdt->clk),
+                                    "input clock not found\n");
 
        ret = clk_prepare_enable(wdt->clk);
        if (ret) {