diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2022-11-23 21:18:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-13 12:50:03 +0200 |
| commit | 48a8a53939604aaab44c0699851f201f80db877d (patch) | |
| tree | c1f516fa301b6638481d628773071965c0504a4f /include/linux | |
| parent | f0b422a04f823faec0aa7d5b6e9cdbffbbe1e7bd (diff) | |
| download | linux-stable-48a8a53939604aaab44c0699851f201f80db877d.tar.gz linux-stable-48a8a53939604aaab44c0699851f201f80db877d.tar.bz2 linux-stable-48a8a53939604aaab44c0699851f201f80db877d.zip | |
timers: Rename del_timer_sync() to timer_delete_sync()
[ Upstream commit 9b13df3fb64ee95e2397585404e442afee2c7d4f ]
The timer related functions do not have a strict timer_ prefixed namespace
which is really annoying.
Rename del_timer_sync() to timer_delete_sync() and provide del_timer_sync()
as a wrapper. Document that del_timer_sync() is not for new code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20221123201624.954785441@linutronix.de
Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/timer.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index a9c20a7ead30..aef40cac2add 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -171,7 +171,20 @@ extern int timer_reduce(struct timer_list *timer, unsigned long expires); extern void add_timer(struct timer_list *timer); extern int try_to_del_timer_sync(struct timer_list *timer); -extern int del_timer_sync(struct timer_list *timer); +extern int timer_delete_sync(struct timer_list *timer); + +/** + * del_timer_sync - Delete a pending timer and wait for a running callback + * @timer: The timer to be deleted + * + * See timer_delete_sync() for detailed explanation. + * + * Do not use in new code. Use timer_delete_sync() instead. + */ +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) |