From nobody Wed Dec 17 05:59:02 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1E0F26B0A2 for ; Mon, 14 Apr 2025 10:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744626205; cv=none; b=SU5Z0HIFtUf+5TqvVPdTblu4bpzy3fRnradsYybp87izjbzouCHIQUAwf2X/Bh9AGmXDUwaoLJO/gthMWvqDtThpzXC+QJjPN3RfvIY/pgmS6YKETMuZ0KcFsrGVkHqUv7obOMTVnzDg5zclUGw3Qa13lvjugym3Jb7VF3asNJw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744626205; c=relaxed/simple; bh=B4zQ0R9s9mJErAxlDoVp1M7AZJ3gl38t8N0pky8+uzY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KNXP1LFsvvK7gG7UnYt0F20blYVACODnXS2UMcRKFeLdKGDGoHHZ35xEgEqXOUtla9cB31jguVFX5QDABbdFu4tYzwGcoQPQhvZBXRbGhrJASmt+bYHe6G52EPbijvg+VtTZsjhPX+VG2Fj0808N7SkDGRDjJB/dqgy22hY67SU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mq8gxCI6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mq8gxCI6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76802C4CEE5; Mon, 14 Apr 2025 10:23:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744626205; bh=B4zQ0R9s9mJErAxlDoVp1M7AZJ3gl38t8N0pky8+uzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mq8gxCI6b3VcYh7JrHXk6ThtSroOrFnT1iqzTfs3N1PNHc+BRbOHk+lgsr0U+eJDa LpV9RlorcWizUP9KVbAh+LnUwQDgatrDSZ3JBJzKpvIeXeIyYUkaSO61RRPR1Tzepq P1Undf62wzvpF6MPuE72aSF8dA5wTIyqRLKuKImlI6yAsBrQOmCjY3qcT5t9P37ux7 AN2ypAEmsTrNz4WxVGxQ1X92iNQlDeS9Kf5d0Uv58hxUPdobCkwer1bGuSCPa/VW0f o5tQmXR+7XGoiEGFuPj1fvK/RLPtGibFeqpCcicq8gUsIiyb3tVZcXG0o3XaL3Vfif Se+ojp1EJ71NA== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Frederic Weisbecker , "H . Peter Anvin" , Linus Torvalds , Peter Zijlstra , Ingo Molnar Subject: [PATCH 07/17] treewide, timers: Rename try_to_del_timer_sync() => timer_delete_sync_try() Date: Mon, 14 Apr 2025 12:22:41 +0200 Message-ID: <20250414102301.332225-8-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250414102301.332225-1-mingo@kernel.org> References: <20250414102301.332225-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move this API to the canonical timer_*() namespace. Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/vector.c | 2 +- drivers/char/random.c | 4 ++-- drivers/irqchip/irq-riscv-imsic-state.c | 2 +- include/linux/timer.h | 2 +- kernel/time/timer.c | 6 +++--- net/bridge/br_multicast.c | 16 ++++++++-------- sound/pci/ctxfi/cttimer.c | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index fee42a73d64a..93069b13d3af 100644 --- 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); =20 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)); =20 unlock_vector_lock(); 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 ne= xt one. + * executing by checking timer_delete_sync_try(), before queueing the ne= xt one. */ - if (!timer_pending(&stack->timer) && try_to_del_timer_sync(&stack->timer= ) >=3D 0) { + if (!timer_pending(&stack->timer) && timer_delete_sync_try(&stack->timer= ) >=3D 0) { struct cpumask timer_cpus; unsigned int num_cpus; =20 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 =3D this_cpu_ptr(imsic->lpriv); =20 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 c35cf0c16095..f662aca5d536 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -162,7 +162,7 @@ extern void add_timer(struct timer_list *timer); extern void timer_add_local(struct timer_list *timer); extern void timer_add_global(struct timer_list *timer); =20 -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 778c4b6e07c4..74c1383e887f 100644 --- 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) } =20 /** - * 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_lis= t *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); =20 #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 3e61a2798d63..bf7e52b2bb13 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -2061,7 +2061,7 @@ static void br_multicast_enable(struct bridge_mcast_o= wn_query *query) { query->startup_sent =3D 0; =20 - if (try_to_del_timer_sync(&query->timer) >=3D 0 || + if (timer_delete_sync_try(&query->timer) >=3D 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) >=3D 0)) + timer_delete_sync_try(&mp->timer) >=3D 0)) mod_timer(&mp->timer, now + max_delay); =20 for (pp =3D &mp->ports; @@ -3488,7 +3488,7 @@ static void br_ip4_multicast_query(struct net_bridge_= mcast *brmctx, pp =3D &p->next) { if (timer_pending(&p->timer) ? time_after(p->timer.expires, now + max_delay) : - try_to_del_timer_sync(&p->timer) >=3D 0 && + timer_delete_sync_try(&p->timer) >=3D 0 && (brmctx->multicast_igmp_version =3D=3D 2 || p->filter_mode =3D=3D MCAST_EXCLUDE)) mod_timer(&p->timer, now + max_delay); @@ -3569,7 +3569,7 @@ static int br_ip6_multicast_query(struct net_bridge_m= cast *brmctx, if (mp->host_joined && (timer_pending(&mp->timer) ? time_after(mp->timer.expires, now + max_delay) : - try_to_del_timer_sync(&mp->timer) >=3D 0)) + timer_delete_sync_try(&mp->timer) >=3D 0)) mod_timer(&mp->timer, now + max_delay); =20 for (pp =3D &mp->ports; @@ -3577,7 +3577,7 @@ static int br_ip6_multicast_query(struct net_bridge_m= cast *brmctx, pp =3D &p->next) { if (timer_pending(&p->timer) ? time_after(p->timer.expires, now + max_delay) : - try_to_del_timer_sync(&p->timer) >=3D 0 && + timer_delete_sync_try(&p->timer) >=3D 0 && (brmctx->multicast_mld_version =3D=3D 1 || p->filter_mode =3D=3D MCAST_EXCLUDE)) mod_timer(&p->timer, now + max_delay); @@ -3649,7 +3649,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brm= ctx, if (!hlist_unhashed(&p->mglist) && (timer_pending(&p->timer) ? time_after(p->timer.expires, time) : - try_to_del_timer_sync(&p->timer) >=3D 0)) { + timer_delete_sync_try(&p->timer) >=3D 0)) { mod_timer(&p->timer, time); } =20 @@ -3665,7 +3665,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brm= ctx, if (mp->host_joined && (timer_pending(&mp->timer) ? time_after(mp->timer.expires, time) : - try_to_del_timer_sync(&mp->timer) >=3D 0)) { + timer_delete_sync_try(&mp->timer) >=3D 0)) { mod_timer(&mp->timer, time); } =20 @@ -3681,7 +3681,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brm= ctx, if (!hlist_unhashed(&p->mglist) && (timer_pending(&p->timer) ? time_after(p->timer.expires, time) : - try_to_del_timer_sync(&p->timer) >=3D 0)) { + timer_delete_sync_try(&p->timer) >=3D 0)) { mod_timer(&p->timer, time); } =20 diff --git a/sound/pci/ctxfi/cttimer.c b/sound/pci/ctxfi/cttimer.c index 56bf567d98b1..fa6867adb42b 100644 --- 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); } =20 #define ct_systimer_free ct_systimer_prepare --=20 2.45.2