rtc: rtc-wm8350: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:19:54 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:32 +0000 (18:28 -0700)
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>
drivers/rtc/rtc-wm8350.c

index 8ad86ae..af81dd6 100644 (file)
@@ -439,8 +439,8 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       wm_rtc->rtc = rtc_device_register("wm8350", &pdev->dev,
-                                         &wm8350_rtc_ops, THIS_MODULE);
+       wm_rtc->rtc = devm_rtc_device_register(&pdev->dev, "wm8350",
+                                       &wm8350_rtc_ops, THIS_MODULE);
        if (IS_ERR(wm_rtc->rtc)) {
                ret = PTR_ERR(wm_rtc->rtc);
                dev_err(&pdev->dev, "failed to register RTC: %d\n", ret);
@@ -462,13 +462,10 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
 static int wm8350_rtc_remove(struct platform_device *pdev)
 {
        struct wm8350 *wm8350 = platform_get_drvdata(pdev);
-       struct wm8350_rtc *wm_rtc = &wm8350->rtc;
 
        wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350);
        wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM, wm8350);
 
-       rtc_device_unregister(wm_rtc->rtc);
-
        return 0;
 }