From 93d78394ac5ec72315e7f9a7193c6649d817a9eb Mon Sep 17 00:00:00 2001 From: Deepak Sikri Date: Mon, 17 Dec 2012 16:02:32 -0800 Subject: [PATCH] rtc: rtc-spear: Add clk_{un}prepare() support clk_{un}prepare is mandatory for platforms using common clock framework. Because for SPEAr we don't do anything in clk_{un}prepare() calls, just call them once in probe/remove. Signed-off-by: Deepak Sikri Signed-off-by: Viresh Kumar Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/rtc/rtc-spear.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c index 311a5274b528..c96f56cfc1d8 100644 --- a/drivers/rtc/rtc-spear.c +++ b/drivers/rtc/rtc-spear.c @@ -395,7 +395,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev) if (IS_ERR(config->clk)) return PTR_ERR(config->clk); - status = clk_enable(config->clk); + status = clk_prepare_enable(config->clk); if (status < 0) return status; @@ -418,7 +418,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev) err_disable_clock: platform_set_drvdata(pdev, NULL); - clk_disable(config->clk); + clk_disable_unprepare(config->clk); return status; } @@ -429,7 +429,7 @@ static int __devexit spear_rtc_remove(struct platform_device *pdev) rtc_device_unregister(config->rtc); spear_rtc_disable_interrupt(config); - clk_disable(config->clk); + clk_disable_unprepare(config->clk); device_init_wakeup(&pdev->dev, 0); return 0; -- GitLab