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

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index fee42a73d64a82d20824c137fc2b5f5cd7da718b..93069b13d3af234ade9e754dd97ec78982138115 100644 (file)
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -864,7 +864,7 @@ void lapic_offline(void)
        __vector_cleanup(cl, false);
 
        irq_matrix_offline(vector_matrix);
-       WARN_ON_ONCE(try_to_del_timer_sync(&cl->timer) < 0);
+       WARN_ON_ONCE(timer_delete_sync_try(&cl->timer) < 0);
        WARN_ON_ONCE(!hlist_empty(&cl->head));
 
        unlock_vector_lock();

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 38f2fab29c569cb92318e8dc1085a63848611eea..4ea4dccc7c46b042b504c218cb29ad08aa6cc5b4 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1311,9 +1311,9 @@ static void __cold try_to_generate_entropy(void)
        while (!crng_ready() && !signal_pending(current)) {
                /*
                 * Check !timer_pending() and then ensure that any previous callback has finished
-                * executing by checking try_to_del_timer_sync(), before queueing the next one.
+                * executing by checking timer_delete_sync_try(), before queueing the next one.
                 */
-               if (!timer_pending(&stack->timer) && try_to_del_timer_sync(&stack->timer) >= 0) {
+               if (!timer_pending(&stack->timer) && timer_delete_sync_try(&stack->timer) >= 0) {
                        struct cpumask timer_cpus;
                        unsigned int num_cpus;
 

diff --git a/drivers/irqchip/irq-riscv-imsic-state.c b/drivers/irqchip/irq-riscv-imsic-state.c
index bdf5cd2037f289e5c374771ab4cf84a0e1b6c227..c39e573825d4221ff87e992d866dc26a83c93248 100644 (file)
--- a/drivers/irqchip/irq-riscv-imsic-state.c
+++ b/drivers/irqchip/irq-riscv-imsic-state.c
@@ -564,7 +564,7 @@ void imsic_state_offline(void)
        struct imsic_local_priv *lpriv = this_cpu_ptr(imsic->lpriv);
 
        raw_spin_lock_irqsave(&lpriv->lock, flags);
-       WARN_ON_ONCE(try_to_del_timer_sync(&lpriv->timer) < 0);
+       WARN_ON_ONCE(timer_delete_sync_try(&lpriv->timer) < 0);
        raw_spin_unlock_irqrestore(&lpriv->lock, flags);
 #endif
 }

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 153d07dad3cdcee5dbb446cfbf394708da37fe78..5b6ff90fcf813fb9c33d92edd3f107599eeecaf9 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -162,7 +162,7 @@ extern void add_timer(struct timer_list *timer);
 extern void add_timer_local(struct timer_list *timer);
 extern void add_timer_global(struct timer_list *timer);
 
-extern int try_to_del_timer_sync(struct timer_list *timer);
+extern int timer_delete_sync_try(struct timer_list *timer);
 extern int timer_delete_sync(struct timer_list *timer);
 extern int timer_delete(struct timer_list *timer);
 extern int timer_shutdown_sync(struct timer_list *timer);

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 012b9190e85951c680020cb9275f5917c0264429..836ba00690bb3b84bceea280c4d3927dd35e44cb 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1511,7 +1511,7 @@ static int __try_to_del_timer_sync(struct timer_list *timer, bool shutdown)
 }
 
 /**
- * try_to_del_timer_sync - Try to deactivate a timer
+ * timer_delete_sync_try - Try to deactivate a timer
  * @timer:     Timer to deactivate
  *
  * This function tries to deactivate a timer. On success the timer is not
@@ -1526,11 +1526,11 @@ static int __try_to_del_timer_sync(struct timer_list *timer, bool shutdown)
  * * %1  - The timer was pending and deactivated
  * * %-1 - The timer callback function is running on a different CPU
  */
-int try_to_del_timer_sync(struct timer_list *timer)
+int timer_delete_sync_try(struct timer_list *timer)
 {
        return __try_to_del_timer_sync(timer, false);
 }
-EXPORT_SYMBOL(try_to_del_timer_sync);
+EXPORT_SYMBOL(timer_delete_sync_try);
 
 #ifdef CONFIG_PREEMPT_RT
 static __init void timer_base_init_expiry_lock(struct timer_base *base)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index dcbf058de1e3b45eb091e6768fed1250d680f930..dc331b59b965a6713fb3a6ee80368448683a27b8 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2061,7 +2061,7 @@ static void br_multicast_enable(struct bridge_mcast_own_query *query)
 {
        query->startup_sent = 0;
 
-       if (try_to_del_timer_sync(&query->timer) >= 0 ||
+       if (timer_delete_sync_try(&query->timer) >= 0 ||
            timer_delete(&query->timer))
                mod_timer(&query->timer, jiffies);
 }
@@ -3480,7 +3480,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
        if (mp->host_joined &&
            (timer_pending(&mp->timer) ?
             time_after(mp->timer.expires, now + max_delay) :
-            try_to_del_timer_sync(&mp->timer) >= 0))
+            timer_delete_sync_try(&mp->timer) >= 0))
                mod_timer(&mp->timer, now + max_delay);
 
        for (pp = &mp->ports;
@@ -3488,7 +3488,7 @@ static void br_ip4_multicast_query(struct net_bridge_mcast *brmctx,
             pp = &p->next) {
                if (timer_pending(&p->timer) ?
                    time_after(p->timer.expires, now + max_delay) :
-                   try_to_del_timer_sync(&p->timer) >= 0 &&
+                   timer_delete_sync_try(&p->timer) >= 0 &&
                    (brmctx->multicast_igmp_version == 2 ||
                     p->filter_mode == MCAST_EXCLUDE))
                        mod_timer(&p->timer, now + max_delay);
@@ -3569,7 +3569,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
        if (mp->host_joined &&
            (timer_pending(&mp->timer) ?
             time_after(mp->timer.expires, now + max_delay) :
-            try_to_del_timer_sync(&mp->timer) >= 0))
+            timer_delete_sync_try(&mp->timer) >= 0))
                mod_timer(&mp->timer, now + max_delay);
 
        for (pp = &mp->ports;
@@ -3577,7 +3577,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx,
             pp = &p->next) {
                if (timer_pending(&p->timer) ?
                    time_after(p->timer.expires, now + max_delay) :
-                   try_to_del_timer_sync(&p->timer) >= 0 &&
+                   timer_delete_sync_try(&p->timer) >= 0 &&
                    (brmctx->multicast_mld_version == 1 ||
                     p->filter_mode == MCAST_EXCLUDE))
                        mod_timer(&p->timer, now + max_delay);
@@ -3649,7 +3649,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,
                        if (!hlist_unhashed(&p->mglist) &&
                            (timer_pending(&p->timer) ?
                             time_after(p->timer.expires, time) :
-                            try_to_del_timer_sync(&p->timer) >= 0)) {
+                            timer_delete_sync_try(&p->timer) >= 0)) {
                                mod_timer(&p->timer, time);
                        }
 
@@ -3665,7 +3665,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,
                if (mp->host_joined &&
                    (timer_pending(&mp->timer) ?
                     time_after(mp->timer.expires, time) :
-                    try_to_del_timer_sync(&mp->timer) >= 0)) {
+                    timer_delete_sync_try(&mp->timer) >= 0)) {
                        mod_timer(&mp->timer, time);
                }
 
@@ -3681,7 +3681,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,
                if (!hlist_unhashed(&p->mglist) &&
                    (timer_pending(&p->timer) ?
                     time_after(p->timer.expires, time) :
-                    try_to_del_timer_sync(&p->timer) >= 0)) {
+                    timer_delete_sync_try(&p->timer) >= 0)) {
                        mod_timer(&p->timer, time);
                }
 

diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c
index 89e47fa14f70b3f548e2a800a05ac091d8040c0a..aa179644b5c9c0774c3ea8243b9357105661edd4 100644 (file)
--- a/sound/pci/ctxfi/cttimer.c
+++ b/sound/pci/ctxfi/cttimer.c
@@ -119,7 +119,7 @@ static void ct_systimer_stop(struct ct_timer_instance *ti)
 static void ct_systimer_prepare(struct ct_timer_instance *ti)
 {
        ct_systimer_stop(ti);
-       try_to_del_timer_sync(&ti->timer);
+       timer_delete_sync_try(&ti->timer);
 }
 
 #define ct_systimer_free       ct_systimer_prepare