[PATCH 2/3] rtc: Factor out the RTC range validation into rtc_valid_range()

From: Baolin Wang
Date: Mon Jan 08 2018 - 01:05:31 EST


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

Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxx>
---
drivers/rtc/interface.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 028dc16..55ada51 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -20,6 +20,18 @@
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 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)
{
int err;
@@ -65,12 +77,9 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
if (err != 0)
return err;

- 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;
- }
+ err = rtc_valid_range(rtc, tm);
+ if (err)
+ return err;

err = mutex_lock_interruptible(&rtc->ops_lock);
if (err)
@@ -370,12 +379,9 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
if (err != 0)
return err;

- if (rtc->range_min != rtc->range_max) {
- time64_t time = rtc_tm_to_time64(&alarm->time);
-
- if (time < rtc->range_min || time > rtc->range_max)
- return -ERANGE;
- }
+ err = rtc_valid_range(rtc, &alarm->time);
+ if (err)
+ return err;

err = mutex_lock_interruptible(&rtc->ops_lock);
if (err)
--
1.7.9.5