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

rtc: ds1305: switch to rtc_tm_to_time64 

Call the 64bit version of rtc_tm to time conversion.

Link: https://lore.kernel.org/r/20200306073459.57197-2-alexandre.belloni@bootlin.com


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

drivers/rtc/rtc-ds1305.c

+2 −6
Original line number Diff line number Diff line
@@ -325,17 +325,13 @@ static int ds1305_set_alarm(struct device *dev, struct rtc_wkalrm *alm) 
	u8		buf[1 + DS1305_ALM_LEN];



	/* convert desired alarm to time_t */

	status = rtc_tm_to_time(&alm->time, &later);

	if (status < 0)

		return status;

	later = rtc_tm_to_time64(&alm->time);



	/* Read current time as time_t */

	status = ds1305_get_time(dev, &tm);

	if (status < 0)

		return status;

	status = rtc_tm_to_time(&tm, &now);

	if (status < 0)

		return status;

	now = rtc_tm_to_time64(&tm);



	/* make sure alarm fires within the next 24 hours */

	if (later <= now)