rk3288 lcdc: add overscan for extern screen

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / sp805_wdt.c

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 76c73cbf00407a89e0176a3d69782988687d3f6e..e42118213ba5c90b1fa221b11e97f2f2353b217f 100644 (file)
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -60,7 +60,6 @@
  * @adev: amba device structure of wdt
  * @status: current status of wdt
  * @load_val: load value to be set for current timeout
- * @timeout: current programmed timeout
  */
 struct sp805_wdt {
        struct watchdog_device          wdd;
@@ -69,7 +68,6 @@ struct sp805_wdt {
        struct clk                      *clk;
        struct amba_device              *adev;
        unsigned int                    load_val;
-       unsigned int                    timeout;
 };
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
@@ -99,7 +97,7 @@ static int wdt_setload(struct watchdog_device *wdd, unsigned int timeout)
        spin_lock(&wdt->lock);
        wdt->load_val = load;
        /* roundup timeout to closest positive integer value */
-       wdt->timeout = div_u64((load + 1) * 2 + (rate / 2), rate);
+       wdd->timeout = div_u64((load + 1) * 2 + (rate / 2), rate);
        spin_unlock(&wdt->lock);
 
        return 0;
@@ -130,16 +128,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 +182,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;
 }