Merge branch 'drm-radeon-sun-hainan' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-lp8788.c

diff --git a/drivers/rtc/rtc-lp8788.c b/drivers/rtc/rtc-lp8788.c
index 9a4631218f41dd7364c5ca332f9ac29456c1791d..9853ac15b296bb0a41ff1a25f0b678a1516975b3 100644 (file)
--- a/drivers/rtc/rtc-lp8788.c
+++ b/drivers/rtc/rtc-lp8788.c
@@ -299,7 +299,7 @@ static int lp8788_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(dev, 1);
 
-       rtc->rdev = rtc_device_register("lp8788_rtc", dev,
+       rtc->rdev = devm_rtc_device_register(dev, "lp8788_rtc",
                                        &lp8788_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc->rdev)) {
                dev_err(dev, "can not register rtc device\n");
@@ -314,9 +314,6 @@ static int lp8788_rtc_probe(struct platform_device *pdev)
 
 static int lp8788_rtc_remove(struct platform_device *pdev)
 {
-       struct lp8788_rtc *rtc = platform_get_drvdata(pdev);
-
-       rtc_device_unregister(rtc->rdev);
        platform_set_drvdata(pdev, NULL);
 
        return 0;