Commit 6ef0f086 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Len Brown

ACPI / idle: pass the cpuidle_device parameter

The cpuidle_device is retrieved in the function by using directly
the global variable. But the caller of this function already have
this device and it can be passed as a parameter. That is one small
step to encapsulate the code more.
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e2668fb5
...@@ -928,13 +928,14 @@ struct cpuidle_driver acpi_idle_driver = { ...@@ -928,13 +928,14 @@ struct cpuidle_driver acpi_idle_driver = {
* device i.e. per-cpu data * device i.e. per-cpu data
* *
* @pr: the ACPI processor * @pr: the ACPI processor
* @dev : the cpuidle device
*/ */
static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr) static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr,
struct cpuidle_device *dev)
{ {
int i, count = CPUIDLE_DRIVER_STATE_START; int i, count = CPUIDLE_DRIVER_STATE_START;
struct acpi_processor_cx *cx; struct acpi_processor_cx *cx;
struct cpuidle_state_usage *state_usage; struct cpuidle_state_usage *state_usage;
struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id);
if (!pr->flags.power_setup_done) if (!pr->flags.power_setup_done)
return -EINVAL; return -EINVAL;
...@@ -1089,7 +1090,7 @@ int acpi_processor_hotplug(struct acpi_processor *pr) ...@@ -1089,7 +1090,7 @@ int acpi_processor_hotplug(struct acpi_processor *pr)
cpuidle_disable_device(dev); cpuidle_disable_device(dev);
acpi_processor_get_power_info(pr); acpi_processor_get_power_info(pr);
if (pr->flags.power) { if (pr->flags.power) {
acpi_processor_setup_cpuidle_cx(pr); acpi_processor_setup_cpuidle_cx(pr, dev);
ret = cpuidle_enable_device(dev); ret = cpuidle_enable_device(dev);
} }
cpuidle_resume_and_unlock(); cpuidle_resume_and_unlock();
...@@ -1147,8 +1148,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) ...@@ -1147,8 +1148,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
continue; continue;
acpi_processor_get_power_info(_pr); acpi_processor_get_power_info(_pr);
if (_pr->flags.power) { if (_pr->flags.power) {
acpi_processor_setup_cpuidle_cx(_pr);
dev = per_cpu(acpi_cpuidle_device, cpu); dev = per_cpu(acpi_cpuidle_device, cpu);
acpi_processor_setup_cpuidle_cx(_pr, dev);
cpuidle_enable_device(dev); cpuidle_enable_device(dev);
} }
} }
...@@ -1217,7 +1218,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr) ...@@ -1217,7 +1218,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)
return -ENOMEM; return -ENOMEM;
per_cpu(acpi_cpuidle_device, pr->id) = dev; per_cpu(acpi_cpuidle_device, pr->id) = dev;
acpi_processor_setup_cpuidle_cx(pr); acpi_processor_setup_cpuidle_cx(pr, dev);
/* Register per-cpu cpuidle_device. Cpuidle driver /* Register per-cpu cpuidle_device. Cpuidle driver
* must already be registered before registering device * must already be registered before registering device
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment