diff options
| author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-10-16 22:12:22 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-11-08 16:14:08 +0100 |
| commit | 9323e9631c8502a08a92b831db55ce9c7434d1bd (patch) | |
| tree | 0a5e90d7cfeec216c8336df60b74c0a9a2b27314 | |
| parent | db2a4af115c4d421bbde6ffedb67112134e3ccd2 (diff) | |
| download | linux-9323e9631c8502a08a92b831db55ce9c7434d1bd.tar.bz2 | |
rtc: fsl-ftm-alarm: switch to rtc_time64_to_tm/rtc_tm_to_time64
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>
| -rw-r--r-- | drivers/rtc/rtc-fsl-ftm-alarm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-fsl-ftm-alarm.c b/drivers/rtc/rtc-fsl-ftm-alarm.c index e954c51bf39b..039bd2f1a7ee 100644 --- a/drivers/rtc/rtc-fsl-ftm-alarm.c +++ b/drivers/rtc/rtc-fsl-ftm-alarm.c @@ -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; |