summaryrefslogtreecommitdiffstats
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2022-11-23 21:18:44 +0100
committerThomas Gleixner <tglx@linutronix.de>2022-11-24 15:09:11 +0100
commit9b13df3fb64ee95e2397585404e442afee2c7d4f (patch)
tree443749fab6bdaebf8f5c9510eae3543230ea0ffa /include/linux/timer.h
parent168f6b6ffbeec0b9333f3582e4cf637300858db5 (diff)
downloadlinux-9b13df3fb64ee95e2397585404e442afee2c7d4f.tar.bz2
timers: Rename del_timer_sync() to timer_delete_sync()
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
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index 31b8b6018f0d..551fa467726f 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -183,7 +183,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);
+}
extern void init_timers(void);
struct hrtimer;