]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-da9052: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:18:57 +0000 (16:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:25 +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-da9052.c

index 969abbad7fe346d0f815c4da6f566b01aeedea45..7286b279cf2d312d07a9a061fb4901cc39bc949e 100644 (file)
@@ -247,7 +247,7 @@ static int da9052_rtc_probe(struct platform_device *pdev)
                return ret;
        }
 
-       rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+       rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                       &da9052_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rtc))
                return PTR_ERR(rtc->rtc);
@@ -257,9 +257,6 @@ static int da9052_rtc_probe(struct platform_device *pdev)
 
 static int da9052_rtc_remove(struct platform_device *pdev)
 {
-       struct da9052_rtc *rtc = pdev->dev.platform_data;
-
-       rtc_device_unregister(rtc->rtc);
        platform_set_drvdata(pdev, NULL);
 
        return 0;