]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: renesas_wdt: make 'clk' a variable local to probe()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Wed, 26 Jul 2017 21:54:38 +0000 (23:54 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Sat, 9 Sep 2017 19:11:55 +0000 (21:11 +0200)
It is not needed outside probe() anymore.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/renesas_wdt.c

index a03997b418ba9c4d5b88eca4177750d3c4912e13..2927b5086e156e55633a8b6054ccbd86128bc6da 100644 (file)
@@ -48,7 +48,6 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
 struct rwdt_priv {
        void __iomem *base;
        struct watchdog_device wdev;
-       struct clk *clk;
        unsigned long clk_rate;
        u8 cks;
 };
@@ -125,6 +124,7 @@ static int rwdt_probe(struct platform_device *pdev)
 {
        struct rwdt_priv *priv;
        struct resource *res;
+       struct clk *clk;
        unsigned long clks_per_sec;
        int ret, i;
 
@@ -137,14 +137,14 @@ static int rwdt_probe(struct platform_device *pdev)
        if (IS_ERR(priv->base))
                return PTR_ERR(priv->base);
 
-       priv->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(priv->clk))
-               return PTR_ERR(priv->clk);
+       clk = devm_clk_get(&pdev->dev, NULL);
+       if (IS_ERR(clk))
+               return PTR_ERR(clk);
 
        pm_runtime_enable(&pdev->dev);
 
        pm_runtime_get_sync(&pdev->dev);
-       priv->clk_rate = clk_get_rate(priv->clk);
+       priv->clk_rate = clk_get_rate(clk);
        pm_runtime_put(&pdev->dev);
 
        if (!priv->clk_rate) {