diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2025-11-29 01:05:32 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-02-11 13:35:28 +0100 |
| commit | 29d5751350cdf6790aadbe6bd485616f3f0ba86f (patch) | |
| tree | 7572dd6b3413dcd032c47ff6b27dee7d9ea362f5 /kernel | |
| parent | a431c4c27ee055ef9abd5575558423b9f7f9cbe6 (diff) | |
| download | linux-29d5751350cdf6790aadbe6bd485616f3f0ba86f.tar.gz linux-29d5751350cdf6790aadbe6bd485616f3f0ba86f.tar.bz2 linux-29d5751350cdf6790aadbe6bd485616f3f0ba86f.zip | |
timers: Rename del_timer() to timer_delete()
[ Upstream commit bb663f0f3c396c6d05f6c5eeeea96ced20ff112e ]
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
Signed-off-by: Jeongjun Park <aha310510@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index c6fa89b0cd6e..672ca2792ed7 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1204,7 +1204,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 @@ -1217,7 +1217,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; @@ -1233,7 +1233,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 |