watchdog: s3c2410_wdt: Use devm_clk_get[_optional]_enabled() helpers

The devm_clk_get[_optional]_enabled() helpers:
    - call devm_clk_get[_optional]()
    - call clk_prepare_enable() and register what is needed in order to
      call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value
to return the error code.

Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230304165653.2179835-1-linux@roeck-us.net
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 200ba236a72eb94fbaa5c29f779621681f4f74f7..a1fcb79b0b7cdb2ecfed7780b79309f40d034cca 100644 (file)
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -661,35 +661,17 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
        if (IS_ERR(wdt->reg_base))
                return PTR_ERR(wdt->reg_base);
 
-       wdt->bus_clk = devm_clk_get(dev, "watchdog");
-       if (IS_ERR(wdt->bus_clk)) {
-               dev_err(dev, "failed to find bus clock\n");
-               return PTR_ERR(wdt->bus_clk);
-       }
-
-       ret = clk_prepare_enable(wdt->bus_clk);
-       if (ret < 0) {
-               dev_err(dev, "failed to enable bus clock\n");
-               return ret;
-       }
+       wdt->bus_clk = devm_clk_get_enabled(dev, "watchdog");
+       if (IS_ERR(wdt->bus_clk))
+               return dev_err_probe(dev, PTR_ERR(wdt->bus_clk), "failed to get bus clock\n");
 
        /*
         * "watchdog_src" clock is optional; if it's not present -- just skip it
         * and use "watchdog" clock as both bus and source clock.
         */
-       wdt->src_clk = devm_clk_get_optional(dev, "watchdog_src");
-       if (IS_ERR(wdt->src_clk)) {
-               dev_err_probe(dev, PTR_ERR(wdt->src_clk),
-                             "failed to get source clock\n");
-               ret = PTR_ERR(wdt->src_clk);
-               goto err_bus_clk;
-       }
-
-       ret = clk_prepare_enable(wdt->src_clk);
-       if (ret) {
-               dev_err(dev, "failed to enable source clock\n");
-               goto err_bus_clk;
-       }
+       wdt->src_clk = devm_clk_get_optional_enabled(dev, "watchdog_src");
+       if (IS_ERR(wdt->src_clk))
+               return dev_err_probe(dev, PTR_ERR(wdt->src_clk), "failed to get source clock\n");
 
        wdt->wdt_device.min_timeout = 1;
        wdt->wdt_device.max_timeout = s3c2410wdt_max_timeout(wdt);
@@ -710,7 +692,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
                                 S3C2410_WATCHDOG_DEFAULT_TIME);
                } else {
                        dev_err(dev, "failed to use default timeout\n");
-                       goto err_src_clk;
+                       return ret;
                }
        }
 
@@ -718,7 +700,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
                               pdev->name, pdev);
        if (ret != 0) {
                dev_err(dev, "failed to install irq (%d)\n", ret);
-               goto err_src_clk;
+               return ret;
        }
 
        watchdog_set_nowayout(&wdt->wdt_device, nowayout);
@@ -744,7 +726,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
 
        ret = watchdog_register_device(&wdt->wdt_device);
        if (ret)
-               goto err_src_clk;
+               return ret;
 
        ret = s3c2410wdt_enable(wdt, true);
        if (ret < 0)
@@ -766,12 +748,6 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
  err_unregister:
        watchdog_unregister_device(&wdt->wdt_device);
 
- err_src_clk:
-       clk_disable_unprepare(wdt->src_clk);
-
- err_bus_clk:
-       clk_disable_unprepare(wdt->bus_clk);
-
        return ret;
 }
 
@@ -786,9 +762,6 @@ static int s3c2410wdt_remove(struct platform_device *dev)
 
        watchdog_unregister_device(&wdt->wdt_device);
 
-       clk_disable_unprepare(wdt->src_clk);
-       clk_disable_unprepare(wdt->bus_clk);
-
        return 0;
 }