Commit a5965a31 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: ab8500: switch to rtc_time64_to_tm/rtc_tm_to_time64 



Call the 64bit versions of rtc_tm time conversion.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20200306010101.39517-1-alexandre.belloni@bootlin.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent c8ff5841

drivers/rtc/rtc-ab8500.c

+5 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm) 
	secs =	secs / COUNTS_PER_SEC;

	secs =	secs + (mins * 60);



	rtc_time_to_tm(secs, tm);

	rtc_time64_to_tm(secs, tm);

	return 0;

}
@@ -110,7 +110,7 @@ static int ab8500_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	unsigned char buf[ARRAY_SIZE(ab8500_rtc_time_regs)];

	unsigned long no_secs, no_mins, secs = 0;



	rtc_tm_to_time(tm, &secs);

	secs = rtc_tm_to_time64(tm);



	no_mins = secs / 60;
@@ -168,7 +168,7 @@ static int ab8500_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) 
	mins = (buf[0] << 16) | (buf[1] << 8) | (buf[2]);

	secs = mins * 60;



	rtc_time_to_tm(secs, &alarm->time);

	rtc_time64_to_tm(secs, &alarm->time);



	return 0;

}
@@ -188,7 +188,7 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) 
	struct rtc_time curtm;



	/* Get the number of seconds since 1970 */

	rtc_tm_to_time(&alarm->time, &secs);

	secs = rtc_tm_to_time64(&alarm->time);



	/*

	 * Check whether alarm is set less than 1min.
@@ -196,7 +196,7 @@ static int ab8500_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) 
	 * return -EINVAL, so UIE EMUL can take it up, incase of UIE_ON

	 */

	ab8500_rtc_read_time(dev, &curtm); /* Read current time */

	rtc_tm_to_time(&curtm, &cursec);

	cursec = rtc_tm_to_time64(&curtm);

	if ((secs - cursec) < 59) {

		dev_dbg(dev, "Alarm less than 1 minute not supported\r\n");

		return -EINVAL;