diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:19:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:32 -0400 |
commit | a5aa777692139c00922d8a8f2a179d2ab0e890e1 (patch) | |
tree | c46586d7e177d2e656ec1177b2fb142f478b4515 /drivers/rtc | |
parent | 3a30b26ea96878c4a081b0c63e05ab2e2fce5444 (diff) |
rtc: rtc-wm8350: 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')
-rw-r--r-- | drivers/rtc/rtc-wm8350.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c index 8ad86ae0d30f..af81dd6a1316 100644 --- a/drivers/rtc/rtc-wm8350.c +++ b/drivers/rtc/rtc-wm8350.c | |||
@@ -439,8 +439,8 @@ static int wm8350_rtc_probe(struct platform_device *pdev) | |||
439 | 439 | ||
440 | device_init_wakeup(&pdev->dev, 1); | 440 | device_init_wakeup(&pdev->dev, 1); |
441 | 441 | ||
442 | wm_rtc->rtc = rtc_device_register("wm8350", &pdev->dev, | 442 | wm_rtc->rtc = devm_rtc_device_register(&pdev->dev, "wm8350", |
443 | &wm8350_rtc_ops, THIS_MODULE); | 443 | &wm8350_rtc_ops, THIS_MODULE); |
444 | if (IS_ERR(wm_rtc->rtc)) { | 444 | if (IS_ERR(wm_rtc->rtc)) { |
445 | ret = PTR_ERR(wm_rtc->rtc); | 445 | ret = PTR_ERR(wm_rtc->rtc); |
446 | dev_err(&pdev->dev, "failed to register RTC: %d\n", ret); | 446 | dev_err(&pdev->dev, "failed to register RTC: %d\n", ret); |
@@ -462,13 +462,10 @@ static int wm8350_rtc_probe(struct platform_device *pdev) | |||
462 | static int wm8350_rtc_remove(struct platform_device *pdev) | 462 | static int wm8350_rtc_remove(struct platform_device *pdev) |
463 | { | 463 | { |
464 | struct wm8350 *wm8350 = platform_get_drvdata(pdev); | 464 | struct wm8350 *wm8350 = platform_get_drvdata(pdev); |
465 | struct wm8350_rtc *wm_rtc = &wm8350->rtc; | ||
466 | 465 | ||
467 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350); | 466 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350); |
468 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM, wm8350); | 467 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM, wm8350); |
469 | 468 | ||
470 | rtc_device_unregister(wm_rtc->rtc); | ||
471 | |||
472 | return 0; | 469 | return 0; |
473 | } | 470 | } |
474 | 471 | ||