Commit 63fbbc16 authored Aug 26, 2012 by Julia Lawall Committed by Wim Van Sebroeck Dec 19, 2012

watchdog: sp805_wdt.c: use clk_prepare_enable and clk_disable_unprepare

Clk_prepare_enable and clk_disable_unprepare combine clk_prepare and
clk_enable, and clk_disable and clk_unprepare.  They make the code more
concise, and ensure that clk_unprepare is called when clk_enable fails.

A simplified version of the semantic patch that introduces calls to these
functions is as follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression e;
@@

- clk_prepare(e);
- clk_enable(e);
+ clk_prepare_enable(e);

@@
expression e;
@@

- clk_disable(e);
- clk_unprepare(e);
+ clk_disable_unprepare(e);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

parent 8157becf

drivers/watchdog/sp805_wdt.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -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;
		}