diff options
author | Rafael J. Wysocki | 2012-09-17 20:25:24 +0200 |
---|---|---|
committer | Rafael J. Wysocki | 2012-09-17 20:25:24 +0200 |
commit | 8592013bbd3858e9427ea2c5fb23a2c983b4dcaa (patch) | |
tree | a03aaef6ccc3f5bb42d7da2d37f7f81ef3854d95 /include | |
parent | Merge branch 'pm-timers' (diff) | |
parent | ACPI / processor: remove pointless variable initialization (diff) | |
download | kernel-qcow2-linux-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.tar.gz kernel-qcow2-linux-8592013bbd3858e9427ea2c5fb23a2c983b4dcaa.tar.xz kernel-qcow2-linux-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 'include')
-rw-r--r-- | include/acpi/processor.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 64ec644808bc..1d3c1a68acce 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -59,7 +59,6 @@ struct acpi_processor_cx { u8 entry_method; u8 index; u32 latency; - u32 power; u8 bm_sts_skip; char desc[ACPI_CX_DESC_LEN]; }; @@ -325,12 +324,10 @@ extern void acpi_processor_reevaluate_tstate(struct acpi_processor *pr, extern const struct file_operations acpi_processor_throttling_fops; extern void acpi_processor_throttling_init(void); /* in processor_idle.c */ -int acpi_processor_power_init(struct acpi_processor *pr, - struct acpi_device *device); +int acpi_processor_power_init(struct acpi_processor *pr); +int acpi_processor_power_exit(struct acpi_processor *pr); int acpi_processor_cst_has_changed(struct acpi_processor *pr); int acpi_processor_hotplug(struct acpi_processor *pr); -int acpi_processor_power_exit(struct acpi_processor *pr, - struct acpi_device *device); int acpi_processor_suspend(struct device *dev); int acpi_processor_resume(struct device *dev); extern struct cpuidle_driver acpi_idle_driver; |