1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c
index 63b17ebe90e8..f3742f364eb8 100644
--- a/drivers/rtc/rtc-88pm80x.c
+++ b/drivers/rtc/rtc-88pm80x.c
@@ -234,7 +234,7 @@ static const struct rtc_class_ops pm80x_rtc_ops = {
         .alarm_irq_enable = pm80x_rtc_alarm_irq_enable,
 };
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int pm80x_rtc_suspend(struct device *dev)
 {
         return pm80x_dev_suspend(dev);
@@ -312,7 +312,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev)
         }
         rtc_tm_to_time(&tm, &ticks);
 
-        info->rtc_dev = rtc_device_register("88pm80x-rtc", &pdev->dev,
+        info->rtc_dev = devm_rtc_device_register(&pdev->dev, "88pm80x-rtc",
                                             &pm80x_rtc_ops, THIS_MODULE);
         if (IS_ERR(info->rtc_dev)) {
                 ret = PTR_ERR(info->rtc_dev);
@@ -346,7 +346,6 @@ static int pm80x_rtc_remove(struct platform_device *pdev)
 {
         struct pm80x_rtc_info *info = platform_get_drvdata(pdev);
         platform_set_drvdata(pdev, NULL);
-        rtc_device_unregister(info->rtc_dev);
         pm80x_free_irq(info->chip, info->irq, info);
         return 0;
 }