Merge tag 'dmaengine-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / drivers / watchdog / dw_wdt.c

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 462f15b..84dca36 100644 (file)
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -566,22 +566,16 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
         * to the common timer/bus clocks configuration, in which the very
         * first found clock supply both timer and APB signals.
         */
-       dw_wdt->clk = devm_clk_get(dev, "tclk");
+       dw_wdt->clk = devm_clk_get_enabled(dev, "tclk");
        if (IS_ERR(dw_wdt->clk)) {
-               dw_wdt->clk = devm_clk_get(dev, NULL);
+               dw_wdt->clk = devm_clk_get_enabled(dev, NULL);
                if (IS_ERR(dw_wdt->clk))
                        return PTR_ERR(dw_wdt->clk);
        }
 
-       ret = clk_prepare_enable(dw_wdt->clk);
-       if (ret)
-               return ret;
-
        dw_wdt->rate = clk_get_rate(dw_wdt->clk);
-       if (dw_wdt->rate == 0) {
-               ret = -EINVAL;
-               goto out_disable_clk;
-       }
+       if (dw_wdt->rate == 0)
+               return -EINVAL;
 
        /*
         * Request APB clock if device is configured with async clocks mode.
@@ -590,21 +584,13 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
         * so the pclk phandle reference is left optional. If it couldn't be
         * found we consider the device configured in synchronous clocks mode.
         */
-       dw_wdt->pclk = devm_clk_get_optional(dev, "pclk");
-       if (IS_ERR(dw_wdt->pclk)) {
-               ret = PTR_ERR(dw_wdt->pclk);
-               goto out_disable_clk;
-       }
-
-       ret = clk_prepare_enable(dw_wdt->pclk);
-       if (ret)
-               goto out_disable_clk;
+       dw_wdt->pclk = devm_clk_get_optional_enabled(dev, "pclk");
+       if (IS_ERR(dw_wdt->pclk))
+               return PTR_ERR(dw_wdt->pclk);
 
        dw_wdt->rst = devm_reset_control_get_optional_shared(&pdev->dev, NULL);
-       if (IS_ERR(dw_wdt->rst)) {
-               ret = PTR_ERR(dw_wdt->rst);
-               goto out_disable_pclk;
-       }
+       if (IS_ERR(dw_wdt->rst))
+               return PTR_ERR(dw_wdt->rst);
 
        /* Enable normal reset without pre-timeout by default. */
        dw_wdt_update_mode(dw_wdt, DW_WDT_RMOD_RESET);
@@ -621,12 +607,12 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
                                       IRQF_SHARED | IRQF_TRIGGER_RISING,
                                       pdev->name, dw_wdt);
                if (ret)
-                       goto out_disable_pclk;
+                       return ret;
 
                dw_wdt->wdd.info = &dw_wdt_pt_ident;
        } else {
                if (ret == -EPROBE_DEFER)
-                       goto out_disable_pclk;
+                       return ret;
 
                dw_wdt->wdd.info = &dw_wdt_ident;
        }
@@ -635,7 +621,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
 
        ret = dw_wdt_init_timeouts(dw_wdt, dev);
        if (ret)
-               goto out_disable_clk;
+               goto out_assert_rst;
 
        wdd = &dw_wdt->wdd;
        wdd->ops = &dw_wdt_ops;
@@ -667,21 +653,18 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
 
        ret = watchdog_register_device(wdd);
        if (ret)
-               goto out_disable_pclk;
+               goto out_assert_rst;
 
        dw_wdt_dbgfs_init(dw_wdt);
 
        return 0;
 
-out_disable_pclk:
-       clk_disable_unprepare(dw_wdt->pclk);
-
-out_disable_clk:
-       clk_disable_unprepare(dw_wdt->clk);
+out_assert_rst:
+       reset_control_assert(dw_wdt->rst);
        return ret;
 }
 
-static int dw_wdt_drv_remove(struct platform_device *pdev)
+static void dw_wdt_drv_remove(struct platform_device *pdev)
 {
        struct dw_wdt *dw_wdt = platform_get_drvdata(pdev);
 
@@ -689,10 +672,6 @@ static int dw_wdt_drv_remove(struct platform_device *pdev)
 
        watchdog_unregister_device(&dw_wdt->wdd);
        reset_control_assert(dw_wdt->rst);
-       clk_disable_unprepare(dw_wdt->pclk);
-       clk_disable_unprepare(dw_wdt->clk);
-
-       return 0;
 }
 
 #ifdef CONFIG_OF
@@ -705,7 +684,7 @@ MODULE_DEVICE_TABLE(of, dw_wdt_of_match);
 
 static struct platform_driver dw_wdt_driver = {
        .probe          = dw_wdt_drv_probe,
-       .remove         = dw_wdt_drv_remove,
+       .remove_new     = dw_wdt_drv_remove,
        .driver         = {
                .name   = "dw_wdt",
                .of_match_table = of_match_ptr(dw_wdt_of_match),