rtc: interface: Remove unused return value from rtc_timer_cancel()
authorKrzysztof Kozlowski <k.kozlowski.k@gmail.com>
Sun, 3 May 2015 09:57:11 +0000 (18:57 +0900)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Fri, 19 Jun 2015 18:03:20 +0000 (20:03 +0200)
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>
drivers/rtc/interface.c
include/linux/rtc.h

index 166fc60..a6b14c2 100644 (file)
@@ -976,14 +976,12 @@ int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *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);
        if (timer->enabled)
                rtc_timer_remove(rtc, timer);
        mutex_unlock(&rtc->ops_lock);
-       return ret;
 }
 
 
Simple merge