Commit 9cf9f2e7 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpuidle: Change :enter_dead() driver callback return type to void 



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: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarGautham R. Shenoy <gautham.shenoy@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/2285569.iZASKD2KPV@rjwysocki.net
parent f65ee094

drivers/acpi/processor_idle.c

+2 −5
Original line number Diff line number Diff line
@@ -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)

include/linux/cpuidle.h

+1 −1
Original line number Diff line number Diff line
@@ -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