Commit 9323e963 authored by Alexandre Belloni's avatar Alexandre Belloni

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.comSigned-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent db2a4af1
...@@ -180,7 +180,7 @@ static int ftm_rtc_alarm_irq_enable(struct device *dev, ...@@ -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) 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; return 0;
} }
...@@ -204,12 +204,13 @@ static int ftm_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) ...@@ -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) static int ftm_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
{ {
struct rtc_time tm; 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); struct ftm_rtc *rtc = dev_get_drvdata(dev);
ftm_rtc_read_time(dev, &tm); ftm_rtc_read_time(dev, &tm);
rtc_tm_to_time(&tm, &now); now = rtc_tm_to_time64(&tm);
rtc_tm_to_time(&alm->time, &alm_time); alm_time = rtc_tm_to_time64(&alm->time);
ftm_clean_alarm(rtc); ftm_clean_alarm(rtc);
cycle = (alm_time - now) * rtc->alarm_freq; cycle = (alm_time - now) * rtc->alarm_freq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment