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
This commit is contained in:
Родитель
9b13df3fb6
Коммит
bb663f0f3c
|
@ -169,7 +169,6 @@ static inline int timer_pending(const struct timer_list * timer)
|
||||||
}
|
}
|
||||||
|
|
||||||
extern void add_timer_on(struct timer_list *timer, int cpu);
|
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(struct timer_list *timer, unsigned long expires);
|
||||||
extern int mod_timer_pending(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);
|
extern int timer_reduce(struct timer_list *timer, unsigned long expires);
|
||||||
|
@ -184,6 +183,7 @@ extern void add_timer(struct timer_list *timer);
|
||||||
|
|
||||||
extern int try_to_del_timer_sync(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_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
|
* del_timer_sync - Delete a pending timer and wait for a running callback
|
||||||
|
@ -198,6 +198,19 @@ static inline int del_timer_sync(struct timer_list *timer)
|
||||||
return timer_delete_sync(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 init_timers(void);
|
||||||
struct hrtimer;
|
struct hrtimer;
|
||||||
extern enum hrtimer_restart it_real_fn(struct hrtimer *);
|
extern enum hrtimer_restart it_real_fn(struct hrtimer *);
|
||||||
|
|
|
@ -1257,7 +1257,7 @@ void add_timer_on(struct timer_list *timer, int cpu)
|
||||||
EXPORT_SYMBOL_GPL(add_timer_on);
|
EXPORT_SYMBOL_GPL(add_timer_on);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* del_timer - Deactivate a timer.
|
* timer_delete - Deactivate a timer
|
||||||
* @timer: The timer to be deactivated
|
* @timer: The timer to be deactivated
|
||||||
*
|
*
|
||||||
* The function only deactivates a pending timer, but contrary to
|
* 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
|
* * %0 - The timer was not pending
|
||||||
* * %1 - The timer was pending and deactivated
|
* * %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;
|
struct timer_base *base;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -1286,7 +1286,7 @@ int del_timer(struct timer_list *timer)
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(del_timer);
|
EXPORT_SYMBOL(timer_delete);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* try_to_del_timer_sync - Try to deactivate a timer
|
* try_to_del_timer_sync - Try to deactivate a timer
|
||||||
|
|
Загрузка…
Ссылка в новой задаче