[patch V2 10/17] timers: Rename del_timer() to timer_delete()

Thomas Gleixner
2022-11-22T17:45:56Z

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>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Tested-by: Guenter Roeck <linux@roeck-us.net>
---
include/linux/timer.h | 15 ++++++++++++++-
kernel/time/timer.c | 6 +++---
2 files changed, 17 insertions(+), 4 deletions(-)

--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -169,7 +169,6 @@ static inline int timer_pending(const st
}

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,7 @@ extern void add_timer(struct timer_list

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);

/**
* del_timer_sync - Delete a pending timer and wait for a running callback
@@ -198,6 +198,19 @@ static inline int del_timer_sync(struct
return timer_delete_sync(timer);
}

+/**
+ * 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;
extern enum hrtimer_restart it_real_fn(struct hrtimer *);
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1253,7 +1253,7 @@ void add_timer_on(struct timer_list *tim
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
@@ -1266,7 +1266,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;
@@ -1282,7 +1282,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