diff options
author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-04-07 17:12:21 -0400 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-04-11 10:42:54 -0400 |
commit | a659a08180f46cd17a4f838a8f47d5a41f95ffcc (patch) | |
tree | 72d99f83c2a7620843ed0ee2f75312b07c649e64 | |
parent | 0d823abd7c04fb4d2ce02ba0c9f525296c530671 (diff) |
rtc: stmp3xxx: 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.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r-- | drivers/rtc/rtc-stmp3xxx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index a6a2963e89a5..dc0c6cc4849d 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c | |||
@@ -160,7 +160,7 @@ static int stmp3xxx_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) | |||
160 | if (ret) | 160 | if (ret) |
161 | return ret; | 161 | return ret; |
162 | 162 | ||
163 | rtc_time_to_tm(readl(rtc_data->io + STMP3XXX_RTC_SECONDS), rtc_tm); | 163 | rtc_time64_to_tm(readl(rtc_data->io + STMP3XXX_RTC_SECONDS), rtc_tm); |
164 | return 0; | 164 | return 0; |
165 | } | 165 | } |
166 | 166 | ||
@@ -214,17 +214,15 @@ static int stmp3xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) | |||
214 | { | 214 | { |
215 | struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); | 215 | struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); |
216 | 216 | ||
217 | rtc_time_to_tm(readl(rtc_data->io + STMP3XXX_RTC_ALARM), &alm->time); | 217 | rtc_time64_to_tm(readl(rtc_data->io + STMP3XXX_RTC_ALARM), &alm->time); |
218 | return 0; | 218 | return 0; |
219 | } | 219 | } |
220 | 220 | ||
221 | static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) | 221 | static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) |
222 | { | 222 | { |
223 | unsigned long t; | ||
224 | struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); | 223 | struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); |
225 | 224 | ||
226 | rtc_tm_to_time(&alm->time, &t); | 225 | writel(rtc_tm_to_time64(&alm->time), rtc_data->io + STMP3XXX_RTC_ALARM); |
227 | writel(t, rtc_data->io + STMP3XXX_RTC_ALARM); | ||
228 | 226 | ||
229 | stmp3xxx_alarm_irq_enable(dev, alm->enabled); | 227 | stmp3xxx_alarm_irq_enable(dev, alm->enabled); |
230 | 228 | ||