From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM <linux-pm@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
x86 Maintainers <x86@kernel.org>,
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>,
"Gautham R. Shenoy" <gautham.shenoy@amd.com>,
Artem Bityutskiy <artem.bityutskiy@linux.intel.com>,
Mario Limonciello <mario.limonciello@amd.com>,
Linux ACPI <linux-acpi@vger.kernel.org>
Subject: [PATCH v2 2/2] cpuidle: Change :enter_dead() driver callback return type to void
Date: Fri, 15 Nov 2024 22:00:25 +0100 [thread overview]
Message-ID: <2285569.iZASKD2KPV@rjwysocki.net> (raw)
In-Reply-To: <13636465.uLZWGnKmhe@rjwysocki.net>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
After a previous change, cpuidle_play_dead(), which is the only caller
of idle state :enter_dead() callbacks, ignores their return values, so
they may as well be void.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
v1 -> v2: New patch
Interestingly enough, the only user of :enter_dead() idle state callbacks
in the current mainline turns out to be ACPI idle.
---
drivers/acpi/processor_idle.c | 7 ++-----
include/linux/cpuidle.h | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
Index: linux-pm/include/linux/cpuidle.h
===================================================================
--- linux-pm.orig/include/linux/cpuidle.h
+++ linux-pm/include/linux/cpuidle.h
@@ -61,7 +61,7 @@ struct cpuidle_state {
struct cpuidle_driver *drv,
int index);
- int (*enter_dead) (struct cpuidle_device *dev, int index);
+ void (*enter_dead) (struct cpuidle_device *dev, int index);
/*
* CPUs execute ->enter_s2idle with the local tick or entire timekeeping
Index: linux-pm/drivers/acpi/processor_idle.c
===================================================================
--- linux-pm.orig/drivers/acpi/processor_idle.c
+++ linux-pm/drivers/acpi/processor_idle.c
@@ -578,7 +578,7 @@ static void __cpuidle acpi_idle_do_entry
* @dev: the target CPU
* @index: the index of suggested state
*/
-static int acpi_idle_play_dead(struct cpuidle_device *dev, int index)
+static void acpi_idle_play_dead(struct cpuidle_device *dev, int index)
{
struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu);
@@ -591,11 +591,8 @@ static int acpi_idle_play_dead(struct cp
else if (cx->entry_method == ACPI_CSTATE_SYSTEMIO) {
io_idle(cx->address);
} else
- return -ENODEV;
+ return;
}
-
- /* Never reached */
- return 0;
}
static __always_inline bool acpi_idle_fallback_to_c1(struct acpi_processor *pr)
next prev parent reply other threads:[~2024-11-15 21:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 20:57 [PATCH v2 0/2] cpuidle: Do not return from cpuidle_play_dead() on callback failures Rafael J. Wysocki
2024-11-15 20:58 ` [PATCH v2 1/2] " Rafael J. Wysocki
2024-11-19 14:04 ` Gautham R. Shenoy
2024-11-15 21:00 ` Rafael J. Wysocki [this message]
2024-11-19 15:09 ` [PATCH v2 2/2] cpuidle: Change :enter_dead() driver callback return type to void Gautham R. Shenoy
2024-11-19 16:05 ` Mario Limonciello
2024-11-19 17:13 ` Rafael J. Wysocki
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=2285569.iZASKD2KPV@rjwysocki.net \
--to=rjw@rjwysocki.net \
--cc=artem.bityutskiy@linux.intel.com \
--cc=gautham.shenoy@amd.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=patryk.wlazlyn@linux.intel.com \
--cc=peterz@infradead.org \
--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