diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-27 12:19:44 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-27 12:19:44 (GMT) |
| commit | 9ec7684c976bc528c2f37bbc0045fab28d16d172 (patch) | |
| tree | 8b3aa19188a7314ac43ed6053e754a67629a5f85 /include | |
| parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) | |
| parent | c878a52d3c7cabab5b24460825c24eafd8be7058 (diff) | |
| download | linux-9ec7684c976bc528c2f37bbc0045fab28d16d172.tar.xz | |
Merge branch 'cpuidle-gen' into pm-cpuidle
* cpuidle-gen:
cpuidle: Check if device is already registered
cpuidle: Introduce __cpuidle_device_init()
cpuidle: Introduce __cpuidle_unregister_device()
cpuidle: Add missing forward declarations of structures
cpuidle: Make cpuidle's sysfs directory dynamically allocated
cpuidle: Fix white space to follow CodingStyle
cpuidle: Check cpuidle_enable_device() return value
cpuidle: Make it clear that governors cannot be modules
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuidle.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 0bc4b74..781addc 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -13,8 +13,6 @@ #include <linux/percpu.h> #include <linux/list.h> -#include <linux/kobject.h> -#include <linux/completion.h> #include <linux/hrtimer.h> #define CPUIDLE_STATE_MAX 10 @@ -61,6 +59,10 @@ struct cpuidle_state { #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000) +struct cpuidle_device_kobj; +struct cpuidle_state_kobj; +struct cpuidle_driver_kobj; + struct cpuidle_device { unsigned int registered:1; unsigned int enabled:1; @@ -71,9 +73,8 @@ struct cpuidle_device { struct cpuidle_state_usage states_usage[CPUIDLE_STATE_MAX]; struct cpuidle_state_kobj *kobjs[CPUIDLE_STATE_MAX]; struct cpuidle_driver_kobj *kobj_driver; + struct cpuidle_device_kobj *kobj_dev; struct list_head device_list; - struct kobject kobj; - struct completion kobj_unregister; #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED int safe_state_index; |