diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-06 19:50:57 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-06 19:50:57 -0400 |
| commit | aa9abe2c8eddf426c9b89757129b132c484ee223 (patch) | |
| tree | 1950d527609f6236405193495a410526a7eb19ea /include/linux | |
| parent | 2c730785d9532d2a9c46e059bd6a6c9a764c539f (diff) | |
| parent | a6220fc19afc07fe77cfd16f5b8e568615517091 (diff) | |
Merge branch 'pm-cpuidle' into pm-sleep
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpuidle.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index b0238cba440b..c51a436135c4 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h | |||
| @@ -120,8 +120,6 @@ struct cpuidle_driver { | |||
| 120 | #ifdef CONFIG_CPU_IDLE | 120 | #ifdef CONFIG_CPU_IDLE |
| 121 | extern void disable_cpuidle(void); | 121 | extern void disable_cpuidle(void); |
| 122 | 122 | ||
| 123 | extern int cpuidle_enabled(struct cpuidle_driver *drv, | ||
| 124 | struct cpuidle_device *dev); | ||
| 125 | extern int cpuidle_select(struct cpuidle_driver *drv, | 123 | extern int cpuidle_select(struct cpuidle_driver *drv, |
| 126 | struct cpuidle_device *dev); | 124 | struct cpuidle_device *dev); |
| 127 | extern int cpuidle_enter(struct cpuidle_driver *drv, | 125 | extern int cpuidle_enter(struct cpuidle_driver *drv, |
| @@ -145,13 +143,11 @@ extern void cpuidle_resume(void); | |||
| 145 | extern int cpuidle_enable_device(struct cpuidle_device *dev); | 143 | extern int cpuidle_enable_device(struct cpuidle_device *dev); |
| 146 | extern void cpuidle_disable_device(struct cpuidle_device *dev); | 144 | extern void cpuidle_disable_device(struct cpuidle_device *dev); |
| 147 | extern int cpuidle_play_dead(void); | 145 | extern int cpuidle_play_dead(void); |
| 146 | extern void cpuidle_use_deepest_state(bool enable); | ||
| 148 | 147 | ||
| 149 | extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev); | 148 | extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev); |
| 150 | #else | 149 | #else |
| 151 | static inline void disable_cpuidle(void) { } | 150 | static inline void disable_cpuidle(void) { } |
| 152 | static inline int cpuidle_enabled(struct cpuidle_driver *drv, | ||
| 153 | struct cpuidle_device *dev) | ||
| 154 | {return -ENODEV; } | ||
| 155 | static inline int cpuidle_select(struct cpuidle_driver *drv, | 151 | static inline int cpuidle_select(struct cpuidle_driver *drv, |
| 156 | struct cpuidle_device *dev) | 152 | struct cpuidle_device *dev) |
| 157 | {return -ENODEV; } | 153 | {return -ENODEV; } |
| @@ -180,6 +176,7 @@ static inline int cpuidle_enable_device(struct cpuidle_device *dev) | |||
| 180 | {return -ENODEV; } | 176 | {return -ENODEV; } |
| 181 | static inline void cpuidle_disable_device(struct cpuidle_device *dev) { } | 177 | static inline void cpuidle_disable_device(struct cpuidle_device *dev) { } |
| 182 | static inline int cpuidle_play_dead(void) {return -ENODEV; } | 178 | static inline int cpuidle_play_dead(void) {return -ENODEV; } |
| 179 | static inline void cpuidle_use_deepest_state(bool enable) {} | ||
| 183 | static inline struct cpuidle_driver *cpuidle_get_cpu_driver( | 180 | static inline struct cpuidle_driver *cpuidle_get_cpu_driver( |
| 184 | struct cpuidle_device *dev) {return NULL; } | 181 | struct cpuidle_device *dev) {return NULL; } |
| 185 | #endif | 182 | #endif |