summaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2022-11-23 21:18:45 +0100
committerThomas Gleixner <tglx@linutronix.de>2022-11-24 15:09:11 +0100
commitbb663f0f3c396c6d05f6c5eeeea96ced20ff112e (patch)
treead4745d7312857b145eb78d8ae3ac5b63c31e2a7 /kernel/time
parent9b13df3fb64ee95e2397585404e442afee2c7d4f (diff)
timers: Rename del_timer() to timer_delete()
The timer related functions do not have a strict timer_ prefixed namespace which is really annoying. Rename del_timer() to timer_delete() and provide del_timer() as a wrapper. Document that del_timer() 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/20221123201625.015535022@linutronix.de
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/timer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 60e538b566e3..2b5e8c26b697 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1257,7 +1257,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
EXPORT_SYMBOL_GPL(add_timer_on);
/**
- * del_timer - Deactivate a timer.
+ * timer_delete - Deactivate a timer
* @timer: The timer to be deactivated
*
* The function only deactivates a pending timer, but contrary to
@@ -1270,7 +1270,7 @@ EXPORT_SYMBOL_GPL(add_timer_on);
* * %0 - The timer was not pending
* * %1 - The timer was pending and deactivated
*/
-int del_timer(struct timer_list *timer)
+int timer_delete(struct timer_list *timer)
{
struct timer_base *base;
unsigned long flags;
@@ -1286,7 +1286,7 @@ int del_timer(struct timer_list *timer)
return ret;
}
-EXPORT_SYMBOL(del_timer);
+EXPORT_SYMBOL(timer_delete);
/**
* try_to_del_timer_sync - Try to deactivate a timer