]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
rtc: rtc-da9055: use devm_rtc_device_register()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:18:58 +0000 (16:18 -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-da9055.c

index 8f0dcfedb83cdfb9c613083574e8e591826beaf5..73858ca9709a1eb6f6af06882f099fe2f9d1d930 100644 (file)
@@ -294,7 +294,7 @@ static int da9055_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+       rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                        &da9055_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rtc)) {
                ret = PTR_ERR(rtc->rtc);
@@ -317,9 +317,6 @@ err_rtc:
 
 static int da9055_rtc_remove(struct platform_device *pdev)
 {
-       struct da9055_rtc *rtc = pdev->dev.platform_data;
-
-       rtc_device_unregister(rtc->rtc);
        platform_set_drvdata(pdev, NULL);
 
        return 0;