]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-test: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Sat, 23 Mar 2013 02:32:36 +0000 (13:32 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Mar 2013 05:11:28 +0000 (16:11 +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-test.c

index b92e0f6383e6bac3549e45310d1c78478216205e..7746e65b93f290aab1db8c422d997d38962ac5ff 100644 (file)
@@ -99,8 +99,10 @@ static DEVICE_ATTR(irq, S_IRUGO | S_IWUSR, test_irq_show, test_irq_store);
 static int test_probe(struct platform_device *plat_dev)
 {
        int err;
-       struct rtc_device *rtc = rtc_device_register("test", &plat_dev->dev,
-                                               &test_rtc_ops, THIS_MODULE);
+       struct rtc_device *rtc;
+
+       rtc = devm_rtc_device_register(&plat_dev->dev, "test",
+                               &test_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc)) {
                err = PTR_ERR(rtc);
                return err;
@@ -115,15 +117,11 @@ static int test_probe(struct platform_device *plat_dev)
        return 0;
 
 err:
-       rtc_device_unregister(rtc);
        return err;
 }
 
 static int test_remove(struct platform_device *plat_dev)
 {
-       struct rtc_device *rtc = platform_get_drvdata(plat_dev);
-
-       rtc_device_unregister(rtc);
        device_remove_file(&plat_dev->dev, &dev_attr_irq);
 
        return 0;