rtc: pl030: switch to rtc_time64_to_tm/rtc_tm_to_time64

Call the 64bit versions of rtc_tm time conversion to avoid the y2106 issue.

Link: https://lore.kernel.org/r/20200306005730.38268-3-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index 55776e8fa87c678100356f05a33e07444661fc7d..ebe03eba8f5ffafa19823082cfe198e8ea658cdb 100644 (file)
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -36,27 +36,24 @@ static int pl030_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct pl030_rtc *rtc = dev_get_drvdata(dev);
 
-       rtc_time_to_tm(readl(rtc->base + RTC_MR), &alrm->time);
+       rtc_time64_to_tm(readl(rtc->base + RTC_MR), &alrm->time);
        return 0;
 }
 
 static int pl030_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
        struct pl030_rtc *rtc = dev_get_drvdata(dev);
-       unsigned long time;
-       int ret;
 
-       ret = rtc_tm_to_time(&alrm->time, &time);
-       if (ret == 0)
-               writel(time, rtc->base + RTC_MR);
-       return ret;
+       writel(rtc_tm_to_time64(&alrm->time), rtc->base + RTC_MR);
+
+       return 0;
 }
 
 static int pl030_read_time(struct device *dev, struct rtc_time *tm)
 {
        struct pl030_rtc *rtc = dev_get_drvdata(dev);
 
-       rtc_time_to_tm(readl(rtc->base + RTC_DR), tm);
+       rtc_time64_to_tm(readl(rtc->base + RTC_DR), tm);
 
        return 0;
 }
@@ -72,14 +69,10 @@ static int pl030_read_time(struct device *dev, struct rtc_time *tm)
 static int pl030_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct pl030_rtc *rtc = dev_get_drvdata(dev);
-       unsigned long time;
-       int ret;
 
-       ret = rtc_tm_to_time(tm, &time);
-       if (ret == 0)
-               writel(time + 1, rtc->base + RTC_LR);
+       writel(rtc_tm_to_time64(tm) + 1, rtc->base + RTC_LR);
 
-       return ret;
+       return 0;
 }
 
 static const struct rtc_class_ops pl030_ops = {