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

index 25ce0621ade994bd5a070ad16ac30c50291d2a6f..8c6c952e90b1c60ab1581c4b073359ed59a1996c 100644 (file)
@@ -326,15 +326,14 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
                }
        }
 
-       rtc = rtc_device_register(pdev->name, &pdev->dev,
+       rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                  &ds1553_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
        pdata->rtc = rtc;
 
        ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
-       if (ret)
-               rtc_device_unregister(rtc);
+
        return ret;
 }
 
@@ -343,7 +342,6 @@ static int ds1553_rtc_remove(struct platform_device *pdev)
        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
        sysfs_remove_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
-       rtc_device_unregister(pdata->rtc);
        if (pdata->irq > 0)
                writeb(0, pdata->ioaddr + RTC_INTERRUPTS);
        return 0;