]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-wm831x: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Wed, 20 Mar 2013 04:08:09 +0000 (15:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 05:34:16 +0000 (16:34 +1100)
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>
drivers/rtc/rtc-wm831x.c

index 2f0ac7b30a0cb9137becf31ed6d81e9934bc5371..8d65b94e5a7eb428fccfadf3d3db77f38a22f1ed 100644 (file)
@@ -436,7 +436,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       wm831x_rtc->rtc = rtc_device_register("wm831x", &pdev->dev,
+       wm831x_rtc->rtc = devm_rtc_device_register(&pdev->dev, "wm831x",
                                              &wm831x_rtc_ops, THIS_MODULE);
        if (IS_ERR(wm831x_rtc->rtc)) {
                ret = PTR_ERR(wm831x_rtc->rtc);
@@ -462,10 +462,6 @@ err:
 
 static int wm831x_rtc_remove(struct platform_device *pdev)
 {
-       struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);
-
-       rtc_device_unregister(wm831x_rtc->rtc);
-
        return 0;
 }