Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

rtc: wm831x: switch to rtc_time64_to_tm/rtc_tm_to_time64 



Call the 64bit versions of rtc_tm time conversion now that the range is
enforced by the core.

Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent d315bc1b

drivers/rtc/rtc-wm831x.c

+4 −12
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int wm831x_rtc_readtime(struct device *dev, struct rtc_time *tm) 
		if (memcmp(time1, time2, sizeof(time1)) == 0) {

			u32 time = (time1[0] << 16) | time1[1];



			rtc_time_to_tm(time, tm);

			rtc_time64_to_tm(time, tm);

			return 0;

		}
@@ -215,11 +215,7 @@ static int wm831x_rtc_set_mmss(struct device *dev, unsigned long time) 
	if (ret < 0)

		return ret;



	ret = rtc_tm_to_time(&new_tm, &new_time);

	if (ret < 0) {

		dev_err(dev, "Failed to convert time: %d\n", ret);

		return ret;

	}

	new_time = rtc_tm_to_time64(&new_tm);



	/* Allow a second of change in case of tick */

	if (new_time - time > 1) {
@@ -249,7 +245,7 @@ static int wm831x_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) 


	time = (data[0] << 16) | data[1];



	rtc_time_to_tm(time, &alrm->time);

	rtc_time64_to_tm(time, &alrm->time);



	ret = wm831x_reg_read(wm831x_rtc->wm831x, WM831X_RTC_CONTROL);

	if (ret < 0) {
@@ -288,11 +284,7 @@ static int wm831x_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	int ret;

	unsigned long time;



	ret = rtc_tm_to_time(&alrm->time, &time);

	if (ret < 0) {

		dev_err(dev, "Failed to convert time: %d\n", ret);

		return ret;

	}

	time = rtc_tm_to_time64(&alrm->time);



	ret = wm831x_rtc_stop_alarm(wm831x_rtc);

	if (ret < 0) {