Skip to content

Commit

Permalink
watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare
Browse files Browse the repository at this point in the history
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Thomas Abraham authored and Wim Van Sebroeck committed Dec 19, 2012
1 parent 2d076bb commit 50d854c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/watchdog/s3c2410_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
goto err_map;
}

clk_enable(wdt_clock);
clk_prepare_enable(wdt_clock);

ret = s3c2410wdt_cpufreq_register();
if (ret < 0) {
Expand Down Expand Up @@ -421,7 +421,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
s3c2410wdt_cpufreq_deregister();

err_clk:
clk_disable(wdt_clock);
clk_disable_unprepare(wdt_clock);
clk_put(wdt_clock);
wdt_clock = NULL;

Expand All @@ -445,7 +445,7 @@ static int s3c2410wdt_remove(struct platform_device *dev)

s3c2410wdt_cpufreq_deregister();

clk_disable(wdt_clock);
clk_disable_unprepare(wdt_clock);
clk_put(wdt_clock);
wdt_clock = NULL;

Expand Down

0 comments on commit 50d854c

Please sign in to comment.