diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-07 19:53:36 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2025-05-08 19:49:33 +0200 |
| commit | 367ed4e35734d6e7bce1dbca426a5bf150d76905 (patch) | |
| tree | c01e2195c7f4d0a399362fe39ae9864fc060f538 /drivers | |
| parent | 751e6a394c2ecd08825d5ba527478e171b87144e (diff) | |
| download | linux-next-367ed4e35734d6e7bce1dbca426a5bf150d76905.tar.gz linux-next-367ed4e35734d6e7bce1dbca426a5bf150d76905.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/random.c | 4 | ||||
| -rw-r--r-- | drivers/irqchip/irq-riscv-imsic-state.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 38f2fab29c56..4ea4dccc7c46 100644 --- 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 bdf5cd2037f2..c39e573825d4 100644 --- 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 } |