]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-spear: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Tue, 26 Mar 2013 23:25:28 +0000 (10:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 06:12:41 +0000 (17:12 +1100)
devm_rtc_device_register() is device managed and makes cleanup
paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/rtc/rtc-spear.c

index a18c3192ed404c7b665973964d56264de59204aa..db3ef610dd7c2967aab7cd16b6b426a4357d88f6 100644 (file)
@@ -400,8 +400,8 @@ static int spear_rtc_probe(struct platform_device *pdev)
        spin_lock_init(&config->lock);
        platform_set_drvdata(pdev, config);
 
-       config->rtc = rtc_device_register(pdev->name, &pdev->dev,
-                       &spear_rtc_ops, THIS_MODULE);
+       config->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+                                       &spear_rtc_ops, THIS_MODULE);
        if (IS_ERR(config->rtc)) {
                dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
                                PTR_ERR(config->rtc));
@@ -427,7 +427,6 @@ static int spear_rtc_remove(struct platform_device *pdev)
 {
        struct spear_rtc_config *config = platform_get_drvdata(pdev);
 
-       rtc_device_unregister(config->rtc);
        spear_rtc_disable_interrupt(config);
        clk_disable_unprepare(config->clk);
        device_init_wakeup(&pdev->dev, 0);