Commit 37ba6517 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Yu Liao
Browse files

timers: Rename del_timer() to timer_delete() 

mainline inclusion
from mainline-v6.2-rc1
commit bb663f0f
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7R8WG

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=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: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarAnna-Maria Behnsen <anna-maria@linutronix.de>
Link: https://lore.kernel.org/r/20221123201625.015535022@linutronix.de



Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
parent 3875c56a

include/linux/timer.h

+14 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ static inline int timer_pending(const struct timer_list * timer) 
}



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);
@@ -190,6 +189,7 @@ extern void add_timer(struct timer_list *timer); 


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
@@ -204,6 +204,19 @@ static inline int del_timer_sync(struct timer_list *timer) 
	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);

extern void run_local_timers(void);

struct hrtimer;

kernel/time/timer.c

+3 −3
Original line number Diff line number Diff line
@@ -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