[v2,06/22] rtc: cpcap: stop using rtc deprecated functions

Message ID 1499846682-14093-7-git-send-email-benjamin.gaignard@linaro.org
State New
Headers show
Series
  • [v2,01/22] x86: rtc: stop using rtc deprecated functions
Related show

Commit Message

Benjamin Gaignard July 12, 2017, 8:04 a.m.
rtc_time_to_tm() and rtc_tm_to_time() are deprecated because they
rely on 32bits variables and that will make rtc break in y2038/2016.
Stop using those two functions to safer 64bits ones.

version 2:
- fix compilation issues by using do_div()

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>

CC: Alessandro Zummo <a.zummo@towertech.it>
CC: Alexandre Belloni <alexandre.belloni@free-electrons.com>
CC: rtc-linux@googlegroups.com
CC: linux-kernel@vger.kernel.org
---
 drivers/rtc/rtc-cpcap.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

-- 
1.9.1

Patch

diff --git a/drivers/rtc/rtc-cpcap.c b/drivers/rtc/rtc-cpcap.c
index 3a0333e..e92b346 100644
--- a/drivers/rtc/rtc-cpcap.c
+++ b/drivers/rtc/rtc-cpcap.c
@@ -58,24 +58,23 @@  struct cpcap_rtc {
 static void cpcap2rtc_time(struct rtc_time *rtc, struct cpcap_time *cpcap)
 {
 	unsigned long int tod;
-	unsigned long int time;
+	unsigned long long time;
 
 	tod = (cpcap->tod1 & TOD1_MASK) | ((cpcap->tod2 & TOD2_MASK) << 8);
 	time = tod + ((cpcap->day & DAY_MASK) * SECS_PER_DAY);
 
-	rtc_time_to_tm(time, rtc);
+	rtc_time64_to_tm(time, rtc);
 }
 
 static void rtc2cpcap_time(struct cpcap_time *cpcap, struct rtc_time *rtc)
 {
-	unsigned long time;
+	unsigned long long time, tod;
 
-	rtc_tm_to_time(rtc, &time);
-
-	cpcap->day = time / SECS_PER_DAY;
-	time %= SECS_PER_DAY;
-	cpcap->tod2 = (time >> 8) & TOD2_MASK;
-	cpcap->tod1 = time & TOD1_MASK;
+	time = rtc_tm_to_time64(rtc);
+	tod = do_div(time, SECS_PER_DAY);
+	cpcap->day = time;
+	cpcap->tod2 = (tod >> 8) & TOD2_MASK;
+	cpcap->tod1 = tod & TOD1_MASK;
 }
 
 static int cpcap_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)