mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
rtc: sun6i: switch to rtc_time64_to_tm/rtc_tm_to_time64
Call the 64bit versions of rtc_tm time conversion. Tested-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Link: https://lore.kernel.org/r/20200330201226.860967-2-alexandre.belloni@bootlin.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
parent
fd90d48db0
commit
99b7ac9c68
1 changed files with 3 additions and 3 deletions
|
@ -499,7 +499,7 @@ static int sun6i_rtc_getalarm(struct device *dev, struct rtc_wkalrm *wkalrm)
|
|||
|
||||
wkalrm->enabled = !!(alrm_en & SUN6I_ALRM_EN_CNT_EN);
|
||||
wkalrm->pending = !!(alrm_st & SUN6I_ALRM_EN_CNT_EN);
|
||||
rtc_time_to_tm(chip->alarm, &wkalrm->time);
|
||||
rtc_time64_to_tm(chip->alarm, &wkalrm->time);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -520,8 +520,8 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
rtc_tm_to_time(alrm_tm, &time_set);
|
||||
rtc_tm_to_time(&tm_now, &time_now);
|
||||
time_set = rtc_tm_to_time64(alrm_tm);
|
||||
time_now = rtc_tm_to_time64(&tm_now);
|
||||
if (time_set <= time_now) {
|
||||
dev_err(dev, "Date to set in the past\n");
|
||||
return -EINVAL;
|
||||
|
|
Loading…
Reference in a new issue