diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-07-03 18:05:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:46 -0400 |
commit | 3ff2e13ce1b4172bf7d188799d3a106c0e2bb5cd (patch) | |
tree | 19fc480f3a413bfc1bd503070fc8811a2ed70a2e /drivers/rtc/interface.c | |
parent | d8d5290a32d4a698db32f233f11bc2021a803746 (diff) |
drivers/rtc/interface.c: fix checkpatch errors
Fixes the following types of errors:
ERROR: "foo* bar" should be "foo *bar"
ERROR: else should follow close brace '}'
WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/interface.c')
-rw-r--r-- | drivers/rtc/interface.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 42bd57da239d..14c1efdd0757 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c | |||
@@ -109,9 +109,9 @@ int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs) | |||
109 | err = rtc->ops->set_time(rtc->dev.parent, | 109 | err = rtc->ops->set_time(rtc->dev.parent, |
110 | &new); | 110 | &new); |
111 | } | 111 | } |
112 | } | 112 | } else { |
113 | else | ||
114 | err = -EINVAL; | 113 | err = -EINVAL; |
114 | } | ||
115 | 115 | ||
116 | mutex_unlock(&rtc->ops_lock); | 116 | mutex_unlock(&rtc->ops_lock); |
117 | /* A timer might have just expired */ | 117 | /* A timer might have just expired */ |
@@ -367,14 +367,14 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) | |||
367 | err = mutex_lock_interruptible(&rtc->ops_lock); | 367 | err = mutex_lock_interruptible(&rtc->ops_lock); |
368 | if (err) | 368 | if (err) |
369 | return err; | 369 | return err; |
370 | if (rtc->aie_timer.enabled) { | 370 | if (rtc->aie_timer.enabled) |
371 | rtc_timer_remove(rtc, &rtc->aie_timer); | 371 | rtc_timer_remove(rtc, &rtc->aie_timer); |
372 | } | 372 | |
373 | rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time); | 373 | rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time); |
374 | rtc->aie_timer.period = ktime_set(0, 0); | 374 | rtc->aie_timer.period = ktime_set(0, 0); |
375 | if (alarm->enabled) { | 375 | if (alarm->enabled) |
376 | err = rtc_timer_enqueue(rtc, &rtc->aie_timer); | 376 | err = rtc_timer_enqueue(rtc, &rtc->aie_timer); |
377 | } | 377 | |
378 | mutex_unlock(&rtc->ops_lock); | 378 | mutex_unlock(&rtc->ops_lock); |
379 | return err; | 379 | return err; |
380 | } | 380 | } |
@@ -891,7 +891,7 @@ again: | |||
891 | * | 891 | * |
892 | * Kernel interface to initializing an rtc_timer. | 892 | * Kernel interface to initializing an rtc_timer. |
893 | */ | 893 | */ |
894 | void rtc_timer_init(struct rtc_timer *timer, void (*f)(void* p), void* data) | 894 | void rtc_timer_init(struct rtc_timer *timer, void (*f)(void *p), void *data) |
895 | { | 895 | { |
896 | timerqueue_init(&timer->node); | 896 | timerqueue_init(&timer->node); |
897 | timer->enabled = 0; | 897 | timer->enabled = 0; |
@@ -907,7 +907,7 @@ void rtc_timer_init(struct rtc_timer *timer, void (*f)(void* p), void* data) | |||
907 | * | 907 | * |
908 | * Kernel interface to set an rtc_timer | 908 | * Kernel interface to set an rtc_timer |
909 | */ | 909 | */ |
910 | int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer, | 910 | int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *timer, |
911 | ktime_t expires, ktime_t period) | 911 | ktime_t expires, ktime_t period) |
912 | { | 912 | { |
913 | int ret = 0; | 913 | int ret = 0; |
@@ -930,7 +930,7 @@ int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer, | |||
930 | * | 930 | * |
931 | * Kernel interface to cancel an rtc_timer | 931 | * Kernel interface to cancel an rtc_timer |
932 | */ | 932 | */ |
933 | int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer* timer) | 933 | int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer *timer) |
934 | { | 934 | { |
935 | int ret = 0; | 935 | int ret = 0; |
936 | mutex_lock(&rtc->ops_lock); | 936 | mutex_lock(&rtc->ops_lock); |