Commit 66e600a2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Revert "ACPI: processor: idle: Redefine two functions as void" 



Revert commit fbd401e9 ("ACPI: processor: idle: Redefine two
functions as void") because it depends on a problematic one.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 34fa09c6

drivers/acpi/processor_idle.c

+22 −19
Original line number Diff line number Diff line
@@ -1400,45 +1400,47 @@ void acpi_processor_unregister_idle_driver(void) 
	cpuidle_unregister_driver(&acpi_idle_driver);

}



void acpi_processor_power_init(struct acpi_processor *pr)

int acpi_processor_power_init(struct acpi_processor *pr)

{

	int retval;

	struct cpuidle_device *dev;



	if (disabled_by_idle_boot_param())

		return;

		return 0;



	acpi_processor_cstate_first_run_checks();



	if (!acpi_processor_get_power_info(pr))

		pr->flags.power_setup_done = 1;



	if (!pr->flags.power)

		return;



	if (pr->flags.power) {

		dev = kzalloc(sizeof(*dev), GFP_KERNEL);

		if (!dev)

		return;



			return -ENOMEM;

		per_cpu(acpi_cpuidle_device, pr->id) = dev;



		acpi_processor_setup_cpuidle_dev(pr, dev);



	/*

	 * Register a cpuidle device for this CPU.  The cpuidle driver using

	 * this device is expected to be registered.

		/* Register per-cpu cpuidle_device. Cpuidle driver

		 * must already be registered before registering device

		 */

	if (cpuidle_register_device(dev)) {

		retval = cpuidle_register_device(dev);

		if (retval) {



			per_cpu(acpi_cpuidle_device, pr->id) = NULL;

			kfree(dev);

			return retval;

		}

	}

	return 0;

}



void acpi_processor_power_exit(struct acpi_processor *pr)

int acpi_processor_power_exit(struct acpi_processor *pr)

{

	struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);



	if (disabled_by_idle_boot_param())

		return;

		return 0;



	if (pr->flags.power) {

		cpuidle_unregister_device(dev);
@@ -1446,6 +1448,7 @@ void acpi_processor_power_exit(struct acpi_processor *pr) 
	}



	pr->flags.power_setup_done = 0;

	return 0;

}



MODULE_IMPORT_NS("ACPI_PROCESSOR_IDLE");

include/acpi/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -419,8 +419,8 @@ static inline void acpi_processor_throttling_init(void) {} 
/* in processor_idle.c */

extern struct cpuidle_driver acpi_idle_driver;

#ifdef CONFIG_ACPI_PROCESSOR_IDLE

void acpi_processor_power_init(struct acpi_processor *pr);

void acpi_processor_power_exit(struct acpi_processor *pr);

int acpi_processor_power_init(struct acpi_processor *pr);

int acpi_processor_power_exit(struct acpi_processor *pr);

int acpi_processor_power_state_has_changed(struct acpi_processor *pr);

int acpi_processor_hotplug(struct acpi_processor *pr);

void acpi_processor_register_idle_driver(void);