diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 20:25:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 20:25:24 +0200 |
| commit | 8592013bbd3858e9427ea2c5fb23a2c983b4dcaa (patch) | |
| tree | a03aaef6ccc3f5bb42d7da2d37f7f81ef3854d95 /drivers/acpi | |
| parent | 00e8b2613331042bbe0177e5b9bb5c8a654b14ae (diff) | |
| parent | ed1511b80c92b1b1a8dde567adc090e470a4344a (diff) | |
| download | linux-stable-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.tar.gz linux-stable-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.tar.bz2 linux-stable-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.zip | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
ACPI / processor: remove pointless variable initialization
ACPI / processor: remove unused function parameter
cpuidle / ACPI : remove power from acpi_processor_cx structure
PM / cpuidle: Make ladder governor use the "disabled" state flag
Honor state disabling in the cpuidle ladder governor
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_driver.c | 8 | ||||
| -rw-r--r-- | drivers/acpi/processor_idle.c | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index bfc31cb0dd3e..e78c2a52ea46 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -475,7 +475,7 @@ static __ref int acpi_processor_start(struct acpi_processor *pr) acpi_processor_get_limit_info(pr); if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver) - acpi_processor_power_init(pr, device); + acpi_processor_power_init(pr); pr->cdev = thermal_cooling_device_register("Processor", device, &processor_cooling_ops); @@ -509,7 +509,7 @@ err_remove_sysfs_thermal: err_thermal_unregister: thermal_cooling_device_unregister(pr->cdev); err_power_exit: - acpi_processor_power_exit(pr, device); + acpi_processor_power_exit(pr); return result; } @@ -620,7 +620,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type) return -EINVAL; } - acpi_processor_power_exit(pr, device); + acpi_processor_power_exit(pr); sysfs_remove_link(&device->dev.kobj, "sysdev"); @@ -905,8 +905,6 @@ static int __init acpi_processor_init(void) if (acpi_disabled) return 0; - memset(&errata, 0, sizeof(errata)); - result = acpi_bus_register_driver(&acpi_processor_driver); if (result < 0) return result; diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index ad3730b4038b..c46a44a8c860 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -483,8 +483,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) if (obj->type != ACPI_TYPE_INTEGER) continue; - cx.power = obj->integer.value; - current_count++; memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx)); @@ -1218,8 +1216,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) static int acpi_processor_registered; -int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, - struct acpi_device *device) +int __cpuinit acpi_processor_power_init(struct acpi_processor *pr) { acpi_status status = 0; int retval; @@ -1283,8 +1280,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, return 0; } -int acpi_processor_power_exit(struct acpi_processor *pr, - struct acpi_device *device) +int acpi_processor_power_exit(struct acpi_processor *pr) { if (disabled_by_idle_boot_param()) return 0; |