From: "tip-bot2 for Anna-Maria Behnsen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Anna-Maria Behnsen" <anna-maria@linutronix.de>,
Thomas Gleixner <tglx@linutronix.de>,
Frederic Weisbecker <frederic@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] timers: Rename next_expiry_recalc() to be unique
Date: Sun, 08 Sep 2024 18:58:07 -0000 [thread overview]
Message-ID: <172582188754.2215.6018971900093876238.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240904-devel-anna-maria-b4-timers-flseep-v1-1-e98760256370@linutronix.de>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: fe90c5ba88ad43d42acefb21b57df837be86a61a
Gitweb: https://git.kernel.org/tip/fe90c5ba88ad43d42acefb21b57df837be86a61a
Author: Anna-Maria Behnsen <anna-maria@linutronix.de>
AuthorDate: Wed, 04 Sep 2024 15:04:51 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Sun, 08 Sep 2024 20:47:40 +02:00
timers: Rename next_expiry_recalc() to be unique
next_expiry_recalc is the name of a function as well as the name of a
struct member of struct timer_base. This might lead to confusion.
Rename next_expiry_recalc() to timer_recalc_next_expiry(). No functional
change.
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/all/20240904-devel-anna-maria-b4-timers-flseep-v1-1-e98760256370@linutronix.de
---
kernel/time/timer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 311ea45..5e021a2 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1900,7 +1900,7 @@ static int next_pending_bucket(struct timer_base *base, unsigned offset,
*
* Store next expiry time in base->next_expiry.
*/
-static void next_expiry_recalc(struct timer_base *base)
+static void timer_recalc_next_expiry(struct timer_base *base)
{
unsigned long clk, next, adj;
unsigned lvl, offset = 0;
@@ -2009,7 +2009,7 @@ static unsigned long next_timer_interrupt(struct timer_base *base,
unsigned long basej)
{
if (base->next_expiry_recalc)
- next_expiry_recalc(base);
+ timer_recalc_next_expiry(base);
/*
* Move next_expiry for the empty base into the future to prevent an
@@ -2413,7 +2413,7 @@ static inline void __run_timers(struct timer_base *base)
* jiffies to avoid endless requeuing to current jiffies.
*/
base->clk++;
- next_expiry_recalc(base);
+ timer_recalc_next_expiry(base);
while (levels--)
expire_timers(base, heads + levels);
next prev parent reply other threads:[~2024-09-08 18:58 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 13:04 [PATCH 00/15] timers: Cleanup delay/sleep related mess Anna-Maria Behnsen
2024-09-04 13:04 ` [PATCH 01/15] timers: Rename next_expiry_recalc() to be unique Anna-Maria Behnsen
2024-09-06 13:25 ` Frederic Weisbecker
2024-09-08 18:58 ` tip-bot2 for Anna-Maria Behnsen [this message]
2024-09-04 13:04 ` [PATCH 02/15] cpu: Use already existing usleep_range() Anna-Maria Behnsen
2024-09-06 13:27 ` Frederic Weisbecker
2024-09-08 18:58 ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-09-04 13:04 ` [PATCH 03/15] Comments: Fix wrong singular form of jiffies Anna-Maria Behnsen
2024-09-05 8:42 ` Geert Uytterhoeven
2024-09-08 18:58 ` [tip: timers/core] treewide: Fix wrong singular form of jiffies in comments tip-bot2 for Anna-Maria Behnsen
2024-09-04 13:04 ` [PATCH 04/15] timers: Move *sleep*() and timeout functions into a separate file Anna-Maria Behnsen
2024-09-06 13:42 ` Frederic Weisbecker
2024-09-09 8:10 ` Anna-Maria Behnsen
2024-09-09 12:11 ` Thomas Gleixner
2024-09-08 18:58 ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-09-04 13:04 ` [PATCH 05/15] timers: Rename sleep_idle_range() to sleep_range_idle() Anna-Maria Behnsen
2024-09-06 13:45 ` Frederic Weisbecker
2024-09-06 16:25 ` SeongJae Park
2024-09-08 18:58 ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-09-04 13:04 ` [PATCH 06/15] timers: Update function descriptions of sleep/delay related functions Anna-Maria Behnsen
2024-09-04 14:30 ` Arnd Bergmann
2024-09-05 6:59 ` Thomas Gleixner
2024-09-05 16:07 ` Thomas Gleixner
2024-09-05 19:49 ` Anna-Maria Behnsen
2024-09-04 13:04 ` [PATCH 07/15] timers: Adjust flseep() to reflect reality Anna-Maria Behnsen
2024-09-04 13:04 ` [PATCH 08/15] mm/damon/core: Use generic upper bound recommondation for usleep_range() Anna-Maria Behnsen
2024-09-06 16:31 ` SeongJae Park
2024-09-04 13:04 ` [PATCH 09/15] timers: Add a warning to usleep_range_state() for wrong order of arguments Anna-Maria Behnsen
2024-09-04 13:05 ` [PATCH 10/15] checkpatch: Remove broken sleep/delay related checks Anna-Maria Behnsen
2024-09-05 1:28 ` Joe Perches
2024-09-05 8:04 ` Anna-Maria Behnsen
2024-09-04 13:05 ` [PATCH 11/15] regulator: core: Use fsleep() to get best sleep mechanism Anna-Maria Behnsen
2024-09-04 13:28 ` Mark Brown
2024-09-05 8:24 ` Anna-Maria Behnsen
2024-09-04 13:05 ` [PATCH 12/15] iopoll/regmap/phy/snd: Fix comment referencing outdated timer documentation Anna-Maria Behnsen
2024-09-04 14:03 ` Andrew Lunn
2024-09-05 8:15 ` Anna-Maria Behnsen
2024-09-04 13:05 ` [PATCH 13/15] powerpc/rtas: Use fsleep() to minimize additional sleep duration Anna-Maria Behnsen
2024-09-05 12:24 ` Michael Ellerman
2024-09-04 13:05 ` [PATCH 14/15] media: anysee: Fix link to outdated sleep function documentation Anna-Maria Behnsen
2024-09-04 13:05 ` [PATCH 15/15] timers/Documentation: Cleanup delay/sleep documentation Anna-Maria Behnsen
2024-09-04 14:44 ` [PATCH 00/15] timers: Cleanup delay/sleep related mess Rafael J. Wysocki
2024-10-17 14:19 ` (subset) " Mark Brown
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=172582188754.2215.6018971900093876238.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=anna-maria@linutronix.de \
--cc=frederic@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®