iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtc: wm831x: switch to rtc_time64_to_tm/rtc_tm_to_time64

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

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Alexandre Belloni 2019-03-22 08:16:10 +01:00
parent d315bc1be9
commit 2399244988
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/rtc/rtc-wm831x.c
View File

@ -155,7 +155,7 @@ static int wm831x_rtc_readtime(struct device *dev, struct rtc_time *tm)
if (memcmp(time1, time2, sizeof(time1)) == 0) { if (memcmp(time1, time2, sizeof(time1)) == 0) {
u32 time = (time1[0] << 16) | time1[1]; u32 time = (time1[0] << 16) | time1[1];
rtc_time_to_tm(time, tm); rtc_time64_to_tm(time, tm);
return 0; return 0;
} }
@ -215,11 +215,7 @@ static int wm831x_rtc_set_mmss(struct device *dev, unsigned long time)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = rtc_tm_to_time(&new_tm, &new_time); new_time = rtc_tm_to_time64(&new_tm);
if (ret < 0) {
dev_err(dev, "Failed to convert time: %d\n", ret);
return ret;
}
/* Allow a second of change in case of tick */ /* Allow a second of change in case of tick */
if (new_time - time > 1) { 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]; 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); ret = wm831x_reg_read(wm831x_rtc->wm831x, WM831X_RTC_CONTROL);
if (ret < 0) { if (ret < 0) {
@ -288,11 +284,7 @@ static int wm831x_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
int ret; int ret;
unsigned long time; unsigned long time;
ret = rtc_tm_to_time(&alrm->time, &time); time = rtc_tm_to_time64(&alrm->time);
if (ret < 0) {
dev_err(dev, "Failed to convert time: %d\n", ret);
return ret;
}
ret = wm831x_rtc_stop_alarm(wm831x_rtc); ret = wm831x_rtc_stop_alarm(wm831x_rtc);
if (ret < 0) { if (ret < 0) {