diff options
| author | Rafael J. Wysocki <[email protected]> | 2024-11-22 20:17:18 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2024-11-22 20:17:18 +0000 |
| commit | f3e66e78f2ecb18a55374f7d58030556b751dd79 (patch) | |
| tree | 4a43cef1908c5bf1a769d8c3d3db3ec3e72747b3 /drivers/acpi/processor_idle.c | |
| parent | Merge tag 'cpufreq-arm-updates-6.13' of ssh://gitolite.kernel.org/pub/scm/lin... (diff) | |
| parent | cpuidle: Change :enter_dead() driver callback return type to void (diff) | |
| download | kernel-f3e66e78f2ecb18a55374f7d58030556b751dd79.tar.gz kernel-f3e66e78f2ecb18a55374f7d58030556b751dd79.zip | |
Merge branch 'pm-cpuidle'
Merge additional cpuidle changes for 6.13-rc1:
- Make cpuidle_play_dead() try all idle states with :enter_dead()
callbacks and change their return type to void (Rafael Wysocki).
* pm-cpuidle:
cpuidle: Change :enter_dead() driver callback return type to void
cpuidle: Do not return from cpuidle_play_dead() on callback failures
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 831fa4a12159..ce728cf7e301 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -578,7 +578,7 @@ static void __cpuidle acpi_idle_do_entry(struct acpi_processor_cx *cx) * @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 cpuidle_device *dev, int index) 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) |