From: Jeongjun Park <aha310510@gmail.com>
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,
Jacob Keller <jacob.e.keller@intel.com>,
Jeongjun Park <aha310510@gmail.com>
Subject: [PATCH 6.1.y 02/12] ARM: spear: Do not use timer namespace for timer_shutdown() function
Date: Sat, 11 Oct 2025 00:02:42 +0900 [thread overview]
Message-ID: <20251010150252.1115788-3-aha310510@gmail.com> (raw)
In-Reply-To: <20251010150252.1115788-1-aha310510@gmail.com>
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
[ Upstream commit 80b55772d41d8afec68dbc4ff0368a9fe5d1f390 ]
A new "shutdown" timer state is being added to the generic timer code. One
of the functions to change the timer into the state is called
"timer_shutdown()". This means that there can not be other functions called
"timer_shutdown()" as the timer code owns the "timer_*" name space.
Rename timer_shutdown() to spear_timer_shutdown() to avoid this conflict.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Link: https://lkml.kernel.org/r/20221106212701.822440504@goodmis.org
Link: https://lore.kernel.org/all/20221105060155.228348078@goodmis.org/
Link: https://lore.kernel.org/r/20221110064146.810953418@goodmis.org
Link: https://lore.kernel.org/r/20221123201624.513863211@linutronix.de
Signed-off-by: Jeongjun Park <aha310510@gmail.com>
---
arch/arm/mach-spear/time.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c
index e979e2197f8e..5371c824786d 100644
--- a/arch/arm/mach-spear/time.c
+++ b/arch/arm/mach-spear/time.c
@@ -90,7 +90,7 @@ static void __init spear_clocksource_init(void)
200, 16, clocksource_mmio_readw_up);
}
-static inline void timer_shutdown(struct clock_event_device *evt)
+static inline void spear_timer_shutdown(struct clock_event_device *evt)
{
u16 val = readw(gpt_base + CR(CLKEVT));
@@ -101,7 +101,7 @@ static inline void timer_shutdown(struct clock_event_device *evt)
static int spear_shutdown(struct clock_event_device *evt)
{
- timer_shutdown(evt);
+ spear_timer_shutdown(evt);
return 0;
}
@@ -111,7 +111,7 @@ static int spear_set_oneshot(struct clock_event_device *evt)
u16 val;
/* stop the timer */
- timer_shutdown(evt);
+ spear_timer_shutdown(evt);
val = readw(gpt_base + CR(CLKEVT));
val |= CTRL_ONE_SHOT;
@@ -126,7 +126,7 @@ static int spear_set_periodic(struct clock_event_device *evt)
u16 val;
/* stop the timer */
- timer_shutdown(evt);
+ spear_timer_shutdown(evt);
period = clk_get_rate(gpt_clk) / HZ;
period >>= CTRL_PRESCALER16;
--
next prev parent reply other threads:[~2025-10-10 15:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-10 15:02 [PATCH 6.1.y 00/12] timers: Provide timer_shutdown[_sync]() Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 01/12] Documentation: Remove bogus claim about del_timer_sync() Jeongjun Park
2025-10-10 15:16 ` timers: Provide timer_shutdown[_sync]() bluez.test.bot
2025-10-10 15:02 ` Jeongjun Park [this message]
2025-10-10 15:02 ` [PATCH 6.1.y 03/12] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 04/12] clocksource/drivers/sp804: " Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 05/12] timers: Replace BUG_ON()s Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 06/12] Documentation: Replace del_timer/del_timer_sync() Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 07/12] timers: Silently ignore timers with a NULL function Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 08/12] timers: Split [try_to_]del_timer[_sync]() to prepare for shutdown mode Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 09/12] timers: Add shutdown mechanism to the internal functions Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 10/12] timers: Provide timer_shutdown[_sync]() Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 11/12] timers: Update the documentation to reflect on the new timer_shutdown() API Jeongjun Park
2025-10-10 15:02 ` [PATCH 6.1.y 12/12] Bluetooth: hci_qca: Fix the teardown problem for real Jeongjun Park
2025-10-20 11:17 ` [PATCH 6.1.y 00/12] timers: Provide timer_shutdown[_sync]() Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251010150252.1115788-3-aha310510@gmail.com \
--to=aha310510@gmail.com \
--cc=Julia.Lawall@inria.fr \
--cc=akpm@linux-foundation.org \
--cc=anna-maria@linutronix.de \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=jacob.e.keller@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=luiz.dentz@gmail.com \
--cc=marcel@holtmann.org \
--cc=maz@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sboyd@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).