aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-coh901331.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 19:18:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 21:28:25 -0400
commit94b60dbaa8e129833205e2642f230f9540fda575 (patch)
treefe20d779a8dca0bc4401403c3e09da87996d068c /drivers/rtc/rtc-coh901331.c
parente3c8966858cc71a5acb9084307ce925ea6be7f1d (diff)
rtc: rtc-coh90133: use devm_rtc_device_register()
devm_rtc_device_register() is device managed and makes cleanup paths simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-coh901331.c')
-rw-r--r--drivers/rtc/rtc-coh901331.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index f53fcd6a0172..bf0387f80d2d 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -155,7 +155,6 @@ static int __exit coh901331_remove(struct platform_device *pdev)
155 struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev); 155 struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
156 156
157 if (rtap) { 157 if (rtap) {
158 rtc_device_unregister(rtap->rtc);
159 clk_unprepare(rtap->clk); 158 clk_unprepare(rtap->clk);
160 platform_set_drvdata(pdev, NULL); 159 platform_set_drvdata(pdev, NULL);
161 } 160 }
@@ -211,8 +210,8 @@ static int __init coh901331_probe(struct platform_device *pdev)
211 clk_disable(rtap->clk); 210 clk_disable(rtap->clk);
212 211
213 platform_set_drvdata(pdev, rtap); 212 platform_set_drvdata(pdev, rtap);
214 rtap->rtc = rtc_device_register("coh901331", &pdev->dev, &coh901331_ops, 213 rtap->rtc = devm_rtc_device_register(&pdev->dev, "coh901331",
215 THIS_MODULE); 214 &coh901331_ops, THIS_MODULE);
216 if (IS_ERR(rtap->rtc)) { 215 if (IS_ERR(rtap->rtc)) {
217 ret = PTR_ERR(rtap->rtc); 216 ret = PTR_ERR(rtap->rtc);
218 goto out_no_rtc; 217 goto out_no_rtc;