Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux...

[karo-tx-linux.git] / drivers / watchdog / sp805_wdt.c

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 76c73cbf00407a89e0176a3d69782988687d3f6e..8872642505c0a71a027ccbce25d2e9f3eebe468a 100644 (file)
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -130,16 +130,10 @@ static int wdt_config(struct watchdog_device *wdd, bool ping)
        int ret;
 
        if (!ping) {
-               ret = clk_prepare(wdt->clk);
-               if (ret) {
-                       dev_err(&wdt->adev->dev, "clock prepare fail");
-                       return ret;
-               }
 
-               ret = clk_enable(wdt->clk);
+               ret = clk_prepare_enable(wdt->clk);
                if (ret) {
                        dev_err(&wdt->adev->dev, "clock enable fail");
-                       clk_unprepare(wdt->clk);
                        return ret;
                }
        }
@@ -190,8 +184,7 @@ static int wdt_disable(struct watchdog_device *wdd)
        readl_relaxed(wdt->base + WDTLOCK);
        spin_unlock(&wdt->lock);
 
-       clk_disable(wdt->clk);
-       clk_unprepare(wdt->clk);
+       clk_disable_unprepare(wdt->clk);
 
        return 0;
 }