]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
rtc: rtc-max8907: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:19:06 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:26 +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-max8907.c

index 31ca8faf9f052bb26bd03866b619b048794d3df7..9d62cdb83d113a399930fe7c3470114697aebb47 100644 (file)
@@ -190,7 +190,7 @@ static int max8907_rtc_probe(struct platform_device *pdev)
        rtc->max8907 = max8907;
        rtc->regmap = max8907->regmap_rtc;
 
-       rtc->rtc_dev = rtc_device_register("max8907-rtc", &pdev->dev,
+       rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8907-rtc",
                                        &max8907_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rtc_dev)) {
                ret = PTR_ERR(rtc->rtc_dev);
@@ -217,16 +217,11 @@ static int max8907_rtc_probe(struct platform_device *pdev)
        return 0;
 
 err_unregister:
-       rtc_device_unregister(rtc->rtc_dev);
        return ret;
 }
 
 static int max8907_rtc_remove(struct platform_device *pdev)
 {
-       struct max8907_rtc *rtc = platform_get_drvdata(pdev);
-
-       rtc_device_unregister(rtc->rtc_dev);
-
        return 0;
 }