Browse Source

rtc: interface: Remove unused return value from rtc_timer_cancel()

The rtc_timer_cancel() always returns 0 and cannot fail (calls only
other void-returning functions).

Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Krzysztof Kozlowski 10 years ago
parent
commit
73744a64aa
2 changed files with 2 additions and 4 deletions
  1. 1 3
      drivers/rtc/interface.c
  2. 1 1
      include/linux/rtc.h

+ 1 - 3
drivers/rtc/interface.c

@@ -976,14 +976,12 @@ int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *timer,
  *
  *
  * Kernel interface to cancel an rtc_timer
  * Kernel interface to cancel an rtc_timer
  */
  */
-int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer *timer)
+void rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer *timer)
 {
 {
-	int ret = 0;
 	mutex_lock(&rtc->ops_lock);
 	mutex_lock(&rtc->ops_lock);
 	if (timer->enabled)
 	if (timer->enabled)
 		rtc_timer_remove(rtc, timer);
 		rtc_timer_remove(rtc, timer);
 	mutex_unlock(&rtc->ops_lock);
 	mutex_unlock(&rtc->ops_lock);
-	return ret;
 }
 }
 
 
 
 

+ 1 - 1
include/linux/rtc.h

@@ -200,7 +200,7 @@ int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg);
 void rtc_timer_init(struct rtc_timer *timer, void (*f)(void *p), void *data);
 void rtc_timer_init(struct rtc_timer *timer, void (*f)(void *p), void *data);
 int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *timer,
 int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *timer,
 		    ktime_t expires, ktime_t period);
 		    ktime_t expires, ktime_t period);
-int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer *timer);
+void rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer *timer);
 void rtc_timer_do_work(struct work_struct *work);
 void rtc_timer_do_work(struct work_struct *work);
 
 
 static inline bool is_leap_year(unsigned int year)
 static inline bool is_leap_year(unsigned int year)