Call the 64bit versions of rtc_tm time conversion now that the range is
enforced by the core.

Signed-off-by: Alexandre Belloni <alexandre.bell...@bootlin.com>
---
 drivers/rtc/rtc-imxdi.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c
index 43d9cad69241..8a7ad1502e4f 100644
--- a/drivers/rtc/rtc-imxdi.c
+++ b/drivers/rtc/rtc-imxdi.c
@@ -552,7 +552,7 @@ static int dryice_rtc_read_time(struct device *dev, struct 
rtc_time *tm)
        unsigned long now;
 
        now = readl(imxdi->ioaddr + DTCMR);
-       rtc_time_to_tm(now, tm);
+       rtc_time64_to_tm(now, tm);
 
        return 0;
 }
@@ -618,7 +618,7 @@ static int dryice_rtc_read_alarm(struct device *dev, struct 
rtc_wkalrm *alarm)
        u32 dcamr;
 
        dcamr = readl(imxdi->ioaddr + DCAMR);
-       rtc_time_to_tm(dcamr, &alarm->time);
+       rtc_time64_to_tm(dcamr, &alarm->time);
 
        /* alarm is enabled if the interrupt is enabled */
        alarm->enabled = (readl(imxdi->ioaddr + DIER) & DIER_CAIE) != 0;
@@ -644,9 +644,7 @@ static int dryice_rtc_set_alarm(struct device *dev, struct 
rtc_wkalrm *alarm)
        unsigned long alarm_time;
        int rc;
 
-       rc = rtc_tm_to_time(&alarm->time, &alarm_time);
-       if (rc)
-               return rc;
+       alarm_time = rtc_tm_to_time64(&alarm->time);
 
        /* don't allow setting alarm in the past */
        now = readl(imxdi->ioaddr + DTCMR);
-- 
2.20.1

Reply via email to