watchdog: davinci: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Tue, 1 Sep 2020 15:31:40 +0000 (17:31 +0200)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Wed, 14 Oct 2020 13:02:25 +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-2-krzk@kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/davinci_wdt.c

index 2b3f3cd..e6eaba6 100644 (file)
@@ -206,12 +206,9 @@ static int davinci_wdt_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        davinci_wdt->clk = devm_clk_get(dev, NULL);
-
-       if (IS_ERR(davinci_wdt->clk)) {
-               if (PTR_ERR(davinci_wdt->clk) != -EPROBE_DEFER)
-                       dev_err(dev, "failed to get clock node\n");
-               return PTR_ERR(davinci_wdt->clk);
-       }
+       if (IS_ERR(davinci_wdt->clk))
+               return dev_err_probe(dev, PTR_ERR(davinci_wdt->clk),
+                                    "failed to get clock node\n");
 
        ret = clk_prepare_enable(davinci_wdt->clk);
        if (ret) {