Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22e7551e authored by Lan Tianyu's avatar Lan Tianyu Committed by Rafael J. Wysocki
Browse files

ACPI / processor: Remove acpi_processor_get_limit_info() 



acpi_processor_get_limit_info() is only called in the __acpi_processor_start()
and what it does actually is just to check pr->flags.throttling and set limit.
The pr pointer has been checked in the __acpi_processor_start() before
acpi_processor_get_limit_info() being called. It doesn't make sense still to
keep it as a function. So move code to __acpi_processor_start() and remove
acpi_processor_get_limit_info().

Signed-off-by: default avatarLan Tianyu <tianyu.lan@intel.com>
Acked-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d4e4ab86

drivers/acpi/processor_driver.c

+3 −1
Original line number Diff line number Diff line
@@ -179,7 +179,9 @@ static int __acpi_processor_start(struct acpi_device *device) 
	acpi_processor_load_module(pr);

#endif

	acpi_processor_get_throttling_info(pr);

	acpi_processor_get_limit_info(pr);



	if (pr->flags.throttling)

		pr->flags.limit = 1;



	if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)

		acpi_processor_power_init(pr);

drivers/acpi/processor_thermal.c

+0 −12
Original line number Diff line number Diff line
@@ -186,18 +186,6 @@ static int cpufreq_set_cur_state(unsigned int cpu, int state) 


#endif



int acpi_processor_get_limit_info(struct acpi_processor *pr)

{



	if (!pr)

		return -EINVAL;



	if (pr->flags.throttling)

		pr->flags.limit = 1;



	return 0;

}



/* thermal coolign device callbacks */

static int acpi_processor_max_state(struct acpi_processor *pr)

{