OSDN Git Service

rtc: fsl-ftm-alarm: switch to rtc_time64_to_tm/rtc_tm_to_time64
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Wed, 16 Oct 2019 20:12:22 +0000 (22:12 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Fri, 8 Nov 2019 15:14:08 +0000 (16:14 +0100)
Call the 64bit versions of rtc_tm time conversion to avoid the y2038 issue.

Link: https://lore.kernel.org/r/20191016201223.30568-3-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-fsl-ftm-alarm.c

index e954c51..039bd2f 100644 (file)
@@ -180,7 +180,7 @@ static int ftm_rtc_alarm_irq_enable(struct device *dev,
  */
 static int ftm_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-       rtc_time_to_tm(ktime_get_real_seconds(), tm);
+       rtc_time64_to_tm(ktime_get_real_seconds(), tm);
 
        return 0;
 }
@@ -204,12 +204,13 @@ static int ftm_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
 static int ftm_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
        struct rtc_time tm;
-       unsigned long now, alm_time, cycle;
+       time64_t now, alm_time;
+       unsigned long long cycle;
        struct ftm_rtc *rtc = dev_get_drvdata(dev);
 
        ftm_rtc_read_time(dev, &tm);
-       rtc_tm_to_time(&tm, &now);
-       rtc_tm_to_time(&alm->time, &alm_time);
+       now = rtc_tm_to_time64(&tm);
+       alm_time = rtc_tm_to_time64(&alm->time);
 
        ftm_clean_alarm(rtc);
        cycle = (alm_time - now) * rtc->alarm_freq;