rtc: rtc-imxdi: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:19:03 +0000 (16:19 -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-imxdi.c

index a5a143e..d3a8c8e 100644 (file)
@@ -464,7 +464,7 @@ static int __init dryice_rtc_probe(struct platform_device *pdev)
        }
 
        platform_set_drvdata(pdev, imxdi);
-       imxdi->rtc = rtc_device_register(pdev->name, &pdev->dev,
+       imxdi->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                  &dryice_rtc_ops, THIS_MODULE);
        if (IS_ERR(imxdi->rtc)) {
                rc = PTR_ERR(imxdi->rtc);
@@ -488,8 +488,6 @@ static int __exit dryice_rtc_remove(struct platform_device *pdev)
        /* mask all interrupts */
        __raw_writel(0, imxdi->ioaddr + DIER);
 
-       rtc_device_unregister(imxdi->rtc);
-
        clk_disable_unprepare(imxdi->clk);
 
        return 0;