diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2026-03-16 19:56:22 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2026-03-16 19:56:22 +0100 |
| commit | 965cf928104cc6b3cbd8dc9536ca12f579098a8e (patch) | |
| tree | 5284c2871d41566962315f357c2be8d3c7d31624 /include/linux/timer.h | |
| parent | e0d2c0556a62886a8db485beef41d45be5b24a76 (diff) | |
| parent | 5f2b61f91866c72e259bb164f7d0553908586ac1 (diff) | |
Merge remote-tracking branch 'fslc/5.15-2.2.x-imx' into toradex_5.15-2.2.x-imxtoradex_5.15-2.2.x-imx
This merges stable patches up to v5.15.201
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'include/linux/timer.h')
| -rw-r--r-- | include/linux/timer.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index e78521bce565..00ee960be028 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -169,7 +169,6 @@ static inline int timer_pending(const struct timer_list * timer) } extern void add_timer_on(struct timer_list *timer, int cpu); -extern int del_timer(struct timer_list * timer); extern int mod_timer(struct timer_list *timer, unsigned long expires); extern int mod_timer_pending(struct timer_list *timer, unsigned long expires); extern int timer_reduce(struct timer_list *timer, unsigned long expires); @@ -184,6 +183,9 @@ extern void add_timer(struct timer_list *timer); extern int try_to_del_timer_sync(struct timer_list *timer); extern int timer_delete_sync(struct timer_list *timer); +extern int timer_delete(struct timer_list *timer); +extern int timer_shutdown_sync(struct timer_list *timer); +extern int timer_shutdown(struct timer_list *timer); /** * del_timer_sync - Delete a pending timer and wait for a running callback @@ -198,7 +200,18 @@ static inline int del_timer_sync(struct timer_list *timer) return timer_delete_sync(timer); } -#define del_singleshot_timer_sync(t) del_timer_sync(t) +/** + * del_timer - Delete a pending timer + * @timer: The timer to be deleted + * + * See timer_delete() for detailed explanation. + * + * Do not use in new code. Use timer_delete() instead. + */ +static inline int del_timer(struct timer_list *timer) +{ + return timer_delete(timer); +} extern void init_timers(void); struct hrtimer; |