Commit 626fea04 authored by Xunlei Pang's avatar Xunlei Pang Committed by Alexandre Belloni

rtc: pcf8563: Replace deprecated rtc_time_to_tm() and rtc_tm_to_time()

pcf8563_rtc_set_alarm() uses deprecated rtc_tm_to_time()
and rtc_time_to_tm(), which will overflow in year 2106
on 32-bit machines.

This patch solves this by:
 - Replacing rtc_time_to_tm() with rtc_time64_to_tm()
 - Replacing rtc_tm_to_time() with rtc_tm_to_time64()
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarXunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent d200c79b
...@@ -358,13 +358,13 @@ static int pcf8563_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm) ...@@ -358,13 +358,13 @@ static int pcf8563_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *tm)
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
unsigned char buf[4]; unsigned char buf[4];
int err; int err;
unsigned long alarm_time;
/* The alarm has no seconds, round up to nearest minute */ /* The alarm has no seconds, round up to nearest minute */
if (tm->time.tm_sec) { if (tm->time.tm_sec) {
rtc_tm_to_time(&tm->time, &alarm_time); time64_t alarm_time = rtc_tm_to_time64(&tm->time);
alarm_time += 60-tm->time.tm_sec;
rtc_time_to_tm(alarm_time, &tm->time); alarm_time += 60 - tm->time.tm_sec;
rtc_time64_to_tm(alarm_time, &tm->time);
} }
dev_dbg(dev, "%s, min=%d hour=%d wday=%d mday=%d " dev_dbg(dev, "%s, min=%d hour=%d wday=%d mday=%d "
......
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