Merge tag 'perf-tools-2020-12-24' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / rtc / rtc-mt6397.c

diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c
index f8b1353..6655035 100644 (file)
--- a/drivers/rtc/rtc-mt6397.c
+++ b/drivers/rtc/rtc-mt6397.c
@@ -31,7 +31,8 @@ static int mtk_rtc_write_trigger(struct mt6397_rtc *rtc)
                                        MTK_RTC_POLL_DELAY_US,
                                        MTK_RTC_POLL_TIMEOUT);
        if (ret < 0)
-               dev_err(rtc->dev, "failed to write WRTGE: %d\n", ret);
+               dev_err(rtc->rtc_dev->dev.parent,
+                       "failed to write WRTGR: %d\n", ret);
 
        return ret;
 }
@@ -300,7 +301,7 @@ static int mtk_rtc_probe(struct platform_device *pdev)
 
        rtc->rtc_dev->ops = &mtk_rtc_ops;
 
-       return rtc_register_device(rtc->rtc_dev);
+       return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP