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>

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 166fc60d8b551f558bd2b9cb0930b419ca175db8..a6b14c24d7e3dfd2d7957065ae3cbf89bc886dc5 100644 (file)
--- a/drivers/rtc/interface.c
+++ b/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
  */
-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;
 }
 
 

diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index b0709f80dfb0501ab5e588a53bc28766aa53c2ac..587017e7939c4bc8b3dd3f7bf4c49763557d753d 100644 (file)
--- a/include/linux/rtc.h
+++ b/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);
 int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer *timer,
                    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);
 
 static inline bool is_leap_year(unsigned int year)