aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2012-10-02 18:32:40 -0400
committerWim Van Sebroeck <wim@iguana.be>2012-12-19 16:24:43 -0500
commit50d854c8a72b87ffa5523aa07c5013e2c6657714 (patch)
tree77d28236b4a99dba62249d7240ec9840aa7526f8 /drivers/watchdog
parent2d076bb8397fea2480487e9547e34b8d4f77eb67 (diff)
watchdog: s3c2410_wdt: use clk_prepare_enable and clk_disable_unprepare
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>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/s3c2410_wdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index b0dab10fc6a5..27bcd4e2c4a4 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -354,7 +354,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
354 goto err_map; 354 goto err_map;
355 } 355 }
356 356
357 clk_enable(wdt_clock); 357 clk_prepare_enable(wdt_clock);
358 358
359 ret = s3c2410wdt_cpufreq_register(); 359 ret = s3c2410wdt_cpufreq_register();
360 if (ret < 0) { 360 if (ret < 0) {
@@ -421,7 +421,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
421 s3c2410wdt_cpufreq_deregister(); 421 s3c2410wdt_cpufreq_deregister();
422 422
423 err_clk: 423 err_clk:
424 clk_disable(wdt_clock); 424 clk_disable_unprepare(wdt_clock);
425 clk_put(wdt_clock); 425 clk_put(wdt_clock);
426 wdt_clock = NULL; 426 wdt_clock = NULL;
427 427
@@ -445,7 +445,7 @@ static int s3c2410wdt_remove(struct platform_device *dev)
445 445
446 s3c2410wdt_cpufreq_deregister(); 446 s3c2410wdt_cpufreq_deregister();
447 447
448 clk_disable(wdt_clock); 448 clk_disable_unprepare(wdt_clock);
449 clk_put(wdt_clock); 449 clk_put(wdt_clock);
450 wdt_clock = NULL; 450 wdt_clock = NULL;
451 451