From nobody Sun Apr 5 16:28:29 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AF1934DCE3 for ; Thu, 19 Feb 2026 17:13:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771521227; cv=none; b=J5aQxXFQSbp7/CE7ijptSRNNB6wSCJMD1gbpuMbxLRvSW9rzne4I5QsIABUzl8P9TE2NG1XpAz2uNLJf25KiCA+IcK7hRf4BCS3fpIht13mqjqa1Y5bVFx2f1USuSScD0DNpiH3ymci23zaDLyFfVJy/kHsYhCZL+EZ/jEdwgs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771521227; c=relaxed/simple; bh=xUOfVR4rsP4k4iSxfTxt28P2aCRP7f27RFLz88rROqo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r/jHidgNaIMtLXcqS51fuHIeraQM5OzIw6G/Adw7N7OCUCx2qNnSwkEo7y8JoKH+q9ScWQVhkXAMlJCAy0HmCvIyabA9BnpPWL/4Psy44g/fvRqBWKIRXFOVAwlS+cR7NUNtwjQI8ceuXsJU8E2EGyUYuM5n2QlnvyPl+AGgTCI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KY0zUH8m; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KY0zUH8m" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2ad617d5b80so5272245ad.1 for ; Thu, 19 Feb 2026 09:13:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771521225; x=1772126025; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5aRj16inyvCNx7XEzEMiTg0hEspzqpDmbN1/ltb1rWU=; b=KY0zUH8m7Iw1psu1q0hzSqh8kVqUHFTaFcrn55/eQnUy11muGYTgFrCvWOrV5iJgnt lln5LEFtovSDb0HplHUBW3TsI9mEFiXzZRe3Vd9sAGVO1iSfaLsE1BmWJ3mUUllKl29x qAJZJBel5oaL0VoWEgo+XGDiBR+b8Tg6/JgF8PNZmHch+GikaexuW3jL8tLzchK5GJiC od7B33BMXba+EtDGtQIkkam1AcaTZR5R2UoEGpJ/0sPlc1h527IlL0H3rf2juRSd+b89 ZR5vk9cR8IQO/+5r8N9HKFpHmiydpeWQD2fW2TQ1blK0HFR9heN805WdC2QQJk0L7LRR X0Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521225; x=1772126025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5aRj16inyvCNx7XEzEMiTg0hEspzqpDmbN1/ltb1rWU=; b=qnTKDchJLe7Xcp3l5jaS99GZVH68DENqSD5v3Fb4KSuX0wGn0WsHRHPPMYPRiykcWB k99rw5xSnp5bZbyEtweuEDJznd+3zRQZebZZGNcpMZNhaGl6WTD8HGnrnujsL/EDHpxA Z/z/T5cayLmqhgW1TqCV4vzPe4JJ1k0MvrAKvGowlxonNK4j/ZWZ0jXfXAz2Ww1FPnte YFN3a1jGAk+Ki4DFoAvH80wCWmSCUNdXBkZmDxQwvXSpVOwcSVxGwH3gNzZECiYHiuNj w3gFmtlc5SkJVid6eTe0uuM5jRJ04yZMaAlN08Ln4mEturJ6v9zWg3/tYWMVz7E3a4+x EY5w== X-Forwarded-Encrypted: i=1; AJvYcCXcn6JgLwqrQSW6qhOgb7UPwQVzN0etp7Gtk87+yoLK8AlGh2XvNm516zL2aHbYxEgziUq5Pj/fqfop590=@vger.kernel.org X-Gm-Message-State: AOJu0YzlRnLLrCzl/xaNp5HtLWIlipLivX77KWQlcsKP5zAGHjAhA2gi dpyqR393sGOxvlGkHCxps3DwGAK2srnoX/sCIqpDDKbXFAGO/FBTKs1u X-Gm-Gg: AZuq6aIU+CEog47ej6uuw4NoAunXx2Z/VcdTM7wSjeIPpVwhVsrDTJ3F0UZtclVuShH vAMiiHaiF9xaH6KThUaDbto62b9WxY+PmCE8aUspUFpFQXq00mNkarJCwAR8aBGdrqmMlzN7R8v 2AzMR/bM6XimK3PKjmAHZnphnasSLEd/WyQuDyyF4sQ4IJQWK9bgUH4EhLTWB6ylBOQQviQ2Yn4 LqPYtRmjPxMSH+4HPwz9M5yBb2ScSo5jekph+GK+Gi0Dkm/EKFYvewvU4y/4U2M4M47LHzmLr49 mIvai/yIEzhaqE9LqnnSrnhBAa41NlfQ+qKjKxIzMaJ+M67xAYe6Kefcluf6dGXQaFACHzND43x Fx6rK9bAFJbF5mMWo1Crr/Yn4SbdirLTsCWkthfl2ze3o1aHdRkMp5N0xBZ/oGkcWsRCWpy7jgl BDw+lc9PSGackg4kwJMWvwht5hQ5QtnsoGvqM/SaxQAU3ZIArXXEXWHzn8q9Q1 X-Received: by 2002:a17:903:2b0d:b0:2aa:d7a7:8091 with SMTP id d9443c01a7336-2ad5aed3fcemr29265505ad.12.1771521224611; Thu, 19 Feb 2026 09:13:44 -0800 (PST) Received: from name2965-Precision-7820-Tower.. ([121.185.236.165]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c6e532fa2e5sm15895002a12.26.2026.02.19.09.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:13:43 -0800 (PST) From: Jeongjun Park To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, tglx@linutronix.de, Julia.Lawall@inria.fr, akpm@linux-foundation.org, anna-maria@linutronix.de, arnd@arndb.de, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux@roeck-us.net, luiz.dentz@gmail.com, marcel@holtmann.org, maz@kernel.org, peterz@infradead.org, rostedt@goodmis.org, sboyd@kernel.org, viresh.kumar@linaro.org, zouyipeng@huawei.com, aha310510@gmail.com, linux-staging@lists.linux.dev, Jacob Keller Subject: [PATCH 5.10.y 07/15] timers: Rename del_timer() to timer_delete() Date: Fri, 20 Feb 2026 02:13:02 +0900 Message-Id: <20260219171310.118170-8-aha310510@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260219171310.118170-1-aha310510@gmail.com> References: <20260219171310.118170-1-aha310510@gmail.com> 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" From: Thomas Gleixner [ Upstream commit bb663f0f3c396c6d05f6c5eeeea96ced20ff112e ] 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 Tested-by: Guenter Roeck Reviewed-by: Steven Rostedt (Google) Reviewed-by: Jacob Keller Reviewed-by: Anna-Maria Behnsen Link: https://lore.kernel.org/r/20221123201625.015535022@linutronix.de Signed-off-by: Jeongjun Park --- include/linux/timer.h | 15 ++++++++++++++- kernel/time/timer.c | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/linux/timer.h b/include/linux/timer.h index 551fa467726f..e338e173ce8b 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -169,7 +169,6 @@ static inline int timer_pending(const struct timer_list= * timer) } =20 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_pending(struct timer_list *timer, unsigned long expir= es); extern int timer_reduce(struct timer_list *timer, unsigned long expires); @@ -184,6 +183,7 @@ extern void add_timer(struct timer_list *timer); =20 extern int try_to_del_timer_sync(struct timer_list *timer); extern int timer_delete_sync(struct timer_list *timer); +extern int timer_delete(struct timer_list *timer); =20 /** * 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 *ti= mer) return timer_delete_sync(timer); } =20 +/** + * 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); struct hrtimer; extern enum hrtimer_restart it_real_fn(struct hrtimer *); diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 60e538b566e3..2b5e8c26b697 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1257,7 +1257,7 @@ void add_timer_on(struct timer_list *timer, int cpu) EXPORT_SYMBOL_GPL(add_timer_on); =20 /** - * del_timer - Deactivate a timer. + * timer_delete - Deactivate a timer * @timer: The timer to be deactivated * * 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 * * %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; unsigned long flags; @@ -1286,7 +1286,7 @@ int del_timer(struct timer_list *timer) =20 return ret; } -EXPORT_SYMBOL(del_timer); +EXPORT_SYMBOL(timer_delete); =20 /** * try_to_del_timer_sync - Try to deactivate a timer --