rtc: imxdi: switch to rtc_time64_to_tm/rtc_tm_to_time64
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 16 Apr 2019 08:34:29 +0000 (10:34 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 29 Apr 2019 13:53:43 +0000 (15:53 +0200)
Call the 64bit versions of rtc_tm time conversion now that the range is
enforced by the core.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-imxdi.c

index 43d9cad69241b66fe4c1fb64fd266f8e7dcdf353..8a7ad1502e4f0a97fcdcf4ca1dea7f5a528c8ece 100644 (file)
@@ -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);