Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

treewide, timers: Rename try_to_del_timer_sync() as timer_delete_sync_try()

Move this API to the canonical timer_*() namespace.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250507175338.672442-9-mingo@kernel.org

authored by

Ingo Molnar and committed by
Thomas Gleixner
367ed4e3 751e6a39

+17 -17
+1 -1
arch/x86/kernel/apic/vector.c
··· 864 864 __vector_cleanup(cl, false); 865 865 866 866 irq_matrix_offline(vector_matrix); 867 - WARN_ON_ONCE(try_to_del_timer_sync(&cl->timer) < 0); 867 + WARN_ON_ONCE(timer_delete_sync_try(&cl->timer) < 0); 868 868 WARN_ON_ONCE(!hlist_empty(&cl->head)); 869 869 870 870 unlock_vector_lock();
+2 -2
drivers/char/random.c
··· 1311 1311 while (!crng_ready() && !signal_pending(current)) { 1312 1312 /* 1313 1313 * Check !timer_pending() and then ensure that any previous callback has finished 1314 - * executing by checking try_to_del_timer_sync(), before queueing the next one. 1314 + * executing by checking timer_delete_sync_try(), before queueing the next one. 1315 1315 */ 1316 - if (!timer_pending(&stack->timer) && try_to_del_timer_sync(&stack->timer) >= 0) { 1316 + if (!timer_pending(&stack->timer) && timer_delete_sync_try(&stack->timer) >= 0) { 1317 1317 struct cpumask timer_cpus; 1318 1318 unsigned int num_cpus; 1319 1319
+1 -1
drivers/irqchip/irq-riscv-imsic-state.c
··· 564 564 struct imsic_local_priv *lpriv = this_cpu_ptr(imsic->lpriv); 565 565 566 566 raw_spin_lock_irqsave(&lpriv->lock, flags); 567 - WARN_ON_ONCE(try_to_del_timer_sync(&lpriv->timer) < 0); 567 + WARN_ON_ONCE(timer_delete_sync_try(&lpriv->timer) < 0); 568 568 raw_spin_unlock_irqrestore(&lpriv->lock, flags); 569 569 #endif 570 570 }
+1 -1
include/linux/timer.h
··· 162 162 extern void add_timer_local(struct timer_list *timer); 163 163 extern void add_timer_global(struct timer_list *timer); 164 164 165 - extern int try_to_del_timer_sync(struct timer_list *timer); 165 + extern int timer_delete_sync_try(struct timer_list *timer); 166 166 extern int timer_delete_sync(struct timer_list *timer); 167 167 extern int timer_delete(struct timer_list *timer); 168 168 extern int timer_shutdown_sync(struct timer_list *timer);
+3 -3
kernel/time/timer.c
··· 1511 1511 } 1512 1512 1513 1513 /** 1514 - * try_to_del_timer_sync - Try to deactivate a timer 1514 + * timer_delete_sync_try - Try to deactivate a timer 1515 1515 * @timer: Timer to deactivate 1516 1516 * 1517 1517 * This function tries to deactivate a timer. On success the timer is not ··· 1526 1526 * * %1 - The timer was pending and deactivated 1527 1527 * * %-1 - The timer callback function is running on a different CPU 1528 1528 */ 1529 - int try_to_del_timer_sync(struct timer_list *timer) 1529 + int timer_delete_sync_try(struct timer_list *timer) 1530 1530 { 1531 1531 return __try_to_del_timer_sync(timer, false); 1532 1532 } 1533 - EXPORT_SYMBOL(try_to_del_timer_sync); 1533 + EXPORT_SYMBOL(timer_delete_sync_try); 1534 1534 1535 1535 #ifdef CONFIG_PREEMPT_RT 1536 1536 static __init void timer_base_init_expiry_lock(struct timer_base *base)
+8 -8
net/bridge/br_multicast.c
··· 2061 2061 { 2062 2062 query->startup_sent = 0; 2063 2063 2064 - if (try_to_del_timer_sync(&query->timer) >= 0 || 2064 + if (timer_delete_sync_try(&query->timer) >= 0 || 2065 2065 timer_delete(&query->timer)) 2066 2066 mod_timer(&query->timer, jiffies); 2067 2067 } ··· 3480 3480 if (mp->host_joined && 3481 3481 (timer_pending(&mp->timer) ? 3482 3482 time_after(mp->timer.expires, now + max_delay) : 3483 - try_to_del_timer_sync(&mp->timer) >= 0)) 3483 + timer_delete_sync_try(&mp->timer) >= 0)) 3484 3484 mod_timer(&mp->timer, now + max_delay); 3485 3485 3486 3486 for (pp = &mp->ports; ··· 3488 3488 pp = &p->next) { 3489 3489 if (timer_pending(&p->timer) ? 3490 3490 time_after(p->timer.expires, now + max_delay) : 3491 - try_to_del_timer_sync(&p->timer) >= 0 && 3491 + timer_delete_sync_try(&p->timer) >= 0 && 3492 3492 (brmctx->multicast_igmp_version == 2 || 3493 3493 p->filter_mode == MCAST_EXCLUDE)) 3494 3494 mod_timer(&p->timer, now + max_delay); ··· 3569 3569 if (mp->host_joined && 3570 3570 (timer_pending(&mp->timer) ? 3571 3571 time_after(mp->timer.expires, now + max_delay) : 3572 - try_to_del_timer_sync(&mp->timer) >= 0)) 3572 + timer_delete_sync_try(&mp->timer) >= 0)) 3573 3573 mod_timer(&mp->timer, now + max_delay); 3574 3574 3575 3575 for (pp = &mp->ports; ··· 3577 3577 pp = &p->next) { 3578 3578 if (timer_pending(&p->timer) ? 3579 3579 time_after(p->timer.expires, now + max_delay) : 3580 - try_to_del_timer_sync(&p->timer) >= 0 && 3580 + timer_delete_sync_try(&p->timer) >= 0 && 3581 3581 (brmctx->multicast_mld_version == 1 || 3582 3582 p->filter_mode == MCAST_EXCLUDE)) 3583 3583 mod_timer(&p->timer, now + max_delay); ··· 3649 3649 if (!hlist_unhashed(&p->mglist) && 3650 3650 (timer_pending(&p->timer) ? 3651 3651 time_after(p->timer.expires, time) : 3652 - try_to_del_timer_sync(&p->timer) >= 0)) { 3652 + timer_delete_sync_try(&p->timer) >= 0)) { 3653 3653 mod_timer(&p->timer, time); 3654 3654 } 3655 3655 ··· 3665 3665 if (mp->host_joined && 3666 3666 (timer_pending(&mp->timer) ? 3667 3667 time_after(mp->timer.expires, time) : 3668 - try_to_del_timer_sync(&mp->timer) >= 0)) { 3668 + timer_delete_sync_try(&mp->timer) >= 0)) { 3669 3669 mod_timer(&mp->timer, time); 3670 3670 } 3671 3671 ··· 3681 3681 if (!hlist_unhashed(&p->mglist) && 3682 3682 (timer_pending(&p->timer) ? 3683 3683 time_after(p->timer.expires, time) : 3684 - try_to_del_timer_sync(&p->timer) >= 0)) { 3684 + timer_delete_sync_try(&p->timer) >= 0)) { 3685 3685 mod_timer(&p->timer, time); 3686 3686 } 3687 3687
+1 -1
sound/pci/ctxfi/cttimer.c
··· 119 119 static void ct_systimer_prepare(struct ct_timer_instance *ti) 120 120 { 121 121 ct_systimer_stop(ti); 122 - try_to_del_timer_sync(&ti->timer); 122 + timer_delete_sync_try(&ti->timer); 123 123 } 124 124 125 125 #define ct_systimer_free ct_systimer_prepare