Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73744a64 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Alexandre Belloni
Browse files

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: default avatarKrzysztof Kozlowski <k.kozlowski.k@gmail.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 1796dcce

drivers/rtc/interface.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}

include/linux/rtc.h

+1 −1
Original line number Diff line number Diff line
@@ -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)