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

rtc: Factor out the RTC range validation into rtc_valid_range()

Browse Source 
The RTC range validation code can be factored into rtc_valid_range()
function to avoid duplicate code.

Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Baolin Wang
2018-01-08 14:04:49 +08:00
committed by Alexandre Belloni
parent 71db049e73
commit 4c4e5df1f3
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/rtc/interface.c
View File

@@ -23,6 +23,18 @@
static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer); static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer);
static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer); static void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer);
static int rtc_valid_range(struct rtc_device *rtc, struct rtc_time *tm)
{
if (rtc->range_min != rtc->range_max) {
time64_t time = rtc_tm_to_time64(tm);
if (time < rtc->range_min || time > rtc->range_max)
return -ERANGE;
}
return 0;
}
static int __rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm) static int __rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm)
{ {
int err; int err;
@@ -70,12 +82,9 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
if (err != 0) if (err != 0)
return err; return err;
if (rtc->range_min != rtc->range_max) { err = rtc_valid_range(rtc, tm);
time64_t time = rtc_tm_to_time64(tm); if (err)
return err;
if (time < rtc->range_min || time > rtc->range_max)
return -ERANGE;
}
err = mutex_lock_interruptible(&rtc->ops_lock); err = mutex_lock_interruptible(&rtc->ops_lock);
if (err) if (err)
@@ -381,12 +390,9 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
if (err != 0) if (err != 0)
return err; return err;
if (rtc->range_min != rtc->range_max) { err = rtc_valid_range(rtc, &alarm->time);
time64_t time = rtc_tm_to_time64(&alarm->time); if (err)
return err;
if (time < rtc->range_min || time > rtc->range_max)
return -ERANGE;
}
err = mutex_lock_interruptible(&rtc->ops_lock); err = mutex_lock_interruptible(&rtc->ops_lock);
if (err) if (err)