rtc: rtc-palmas: use devm_rtc_device_register()

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>

diff --git a/drivers/rtc/rtc-palmas.c b/drivers/rtc/rtc-palmas.c
index 59c42986254e09c155130e02641d234738b2481f..bb86bb72782b1131b296b1e6626764c8e4e4a060 100644 (file)
--- a/drivers/rtc/rtc-palmas.c
+++ b/drivers/rtc/rtc-palmas.c
@@ -264,7 +264,7 @@ static int palmas_rtc_probe(struct platform_device *pdev)
 
        palmas_rtc->irq = platform_get_irq(pdev, 0);
 
-       palmas_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev,
+       palmas_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                &palmas_rtc_ops, THIS_MODULE);
        if (IS_ERR(palmas_rtc->rtc)) {
                ret = PTR_ERR(palmas_rtc->rtc);
@@ -279,7 +279,6 @@ static int palmas_rtc_probe(struct platform_device *pdev)
                        dev_name(&pdev->dev), palmas_rtc);
        if (ret < 0) {
                dev_err(&pdev->dev, "IRQ request failed, err = %d\n", ret);
-               rtc_device_unregister(palmas_rtc->rtc);
                return ret;
        }
 
@@ -289,11 +288,8 @@ static int palmas_rtc_probe(struct platform_device *pdev)
 
 static int palmas_rtc_remove(struct platform_device *pdev)
 {
-       struct palmas_rtc *palmas_rtc = platform_get_drvdata(pdev);
-
        palmas_rtc_alarm_irq_enable(&pdev->dev, 0);
        free_irq(palmas_rtc->irq, palmas_rtc);
-       rtc_device_unregister(palmas_rtc->rtc);
        return 0;
 }