aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2018-07-26 18:42:39 +0100
committerBen Hutchings <ben.hutchings@codethink.co.uk>2018-08-24 19:09:49 +0100
commit759b14cafb17968361ba5fee1628281fcfc1df05 (patch)
tree82ba633b8c6ebf65d7811bb473d80728c9510469
parent508f7cc6ba17f34a95619e329eb26ab1bc7d61d8 (diff)
downloadlinux-cip-759b14cafb17968361ba5fee1628281fcfc1df05.tar.gz
watchdog: renesas_wdt: make 'clk' a variable local to probe()
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> (cherry picked from commit 9c22b6d33605d4b24e2491fdb743a285e8588738) Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com> Reviewed-by: Biju Das <biju.das@bp.renesas.com> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
-rw-r--r--drivers/watchdog/renesas_wdt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
index 834cff04e0ff67..0e4a82ea763b17 100644
--- a/drivers/watchdog/renesas_wdt.c
+++ b/drivers/watchdog/renesas_wdt.c
@@ -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;
};
@@ -132,6 +131,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;
@@ -144,14 +144,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) {