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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index 229426dee1eaa0a6f16c2dcee0964482f823c0d5..fc564d359941b1dfb21eb8595a3f1c604f5a8f7b 100644 (file)
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -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);
        unsigned char buf[4];
        int err;
-       unsigned long alarm_time;
 
        /* The alarm has no seconds, round up to nearest minute */
        if (tm->time.tm_sec) {
-               rtc_tm_to_time(&tm->time, &alarm_time);
-               alarm_time += 60-tm->time.tm_sec;
-               rtc_time_to_tm(alarm_time, &tm->time);
+               time64_t alarm_time = rtc_tm_to_time64(&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 "