summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 19:19:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 21:28:26 -0400
commit448d3367f806ad40b56470217535bb642985fa3b (patch)
treebd55d4dcaa23815880c7ed045120ea2d2a966a70
parent04f70e4ca44d284b379304395699573f3b475bea (diff)
rtc: rtc-lp8788: 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>
-rw-r--r--drivers/rtc/rtc-lp8788.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-lp8788.c b/drivers/rtc/rtc-lp8788.c
index 9a4631218f41..9853ac15b296 100644
--- a/drivers/rtc/rtc-lp8788.c
+++ b/drivers/rtc/rtc-lp8788.c
@@ -299,7 +299,7 @@ static int lp8788_rtc_probe(struct platform_device *pdev)
299 299
300 device_init_wakeup(dev, 1); 300 device_init_wakeup(dev, 1);
301 301
302 rtc->rdev = rtc_device_register("lp8788_rtc", dev, 302 rtc->rdev = devm_rtc_device_register(dev, "lp8788_rtc",
303 &lp8788_rtc_ops, THIS_MODULE); 303 &lp8788_rtc_ops, THIS_MODULE);
304 if (IS_ERR(rtc->rdev)) { 304 if (IS_ERR(rtc->rdev)) {
305 dev_err(dev, "can not register rtc device\n"); 305 dev_err(dev, "can not register rtc device\n");
@@ -314,9 +314,6 @@ static int lp8788_rtc_probe(struct platform_device *pdev)
314 314
315static int lp8788_rtc_remove(struct platform_device *pdev) 315static int lp8788_rtc_remove(struct platform_device *pdev)
316{ 316{
317 struct lp8788_rtc *rtc = platform_get_drvdata(pdev);
318
319 rtc_device_unregister(rtc->rdev);
320 platform_set_drvdata(pdev, NULL); 317 platform_set_drvdata(pdev, NULL);
321 318
322 return 0; 319 return 0;