diff options
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 7897cf500c51..c61d5de837ef 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -224,7 +224,6 @@ struct dev_pm_info { | |||
| 224 | unsigned should_wakeup:1; | 224 | unsigned should_wakeup:1; |
| 225 | pm_message_t prev_state; | 225 | pm_message_t prev_state; |
| 226 | void * saved_state; | 226 | void * saved_state; |
| 227 | atomic_t pm_users; | ||
| 228 | struct device * pm_parent; | 227 | struct device * pm_parent; |
| 229 | struct list_head entry; | 228 | struct list_head entry; |
| 230 | #endif | 229 | #endif |
| @@ -244,6 +243,9 @@ extern int device_suspend(pm_message_t state); | |||
| 244 | #define device_may_wakeup(dev) \ | 243 | #define device_may_wakeup(dev) \ |
| 245 | (device_can_wakeup(dev) && (dev)->power.should_wakeup) | 244 | (device_can_wakeup(dev) && (dev)->power.should_wakeup) |
| 246 | 245 | ||
| 246 | extern int dpm_runtime_suspend(struct device *, pm_message_t); | ||
| 247 | extern void dpm_runtime_resume(struct device *); | ||
| 248 | |||
| 247 | #else /* !CONFIG_PM */ | 249 | #else /* !CONFIG_PM */ |
| 248 | 250 | ||
| 249 | static inline int device_suspend(pm_message_t state) | 251 | static inline int device_suspend(pm_message_t state) |
| @@ -254,6 +256,16 @@ static inline int device_suspend(pm_message_t state) | |||
| 254 | #define device_set_wakeup_enable(dev,val) do{}while(0) | 256 | #define device_set_wakeup_enable(dev,val) do{}while(0) |
| 255 | #define device_may_wakeup(dev) (0) | 257 | #define device_may_wakeup(dev) (0) |
| 256 | 258 | ||
| 259 | static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state) | ||
| 260 | { | ||
| 261 | return 0; | ||
| 262 | } | ||
| 263 | |||
| 264 | static inline void dpm_runtime_resume(struct device * dev) | ||
| 265 | { | ||
| 266 | |||
| 267 | } | ||
| 268 | |||
| 257 | #endif | 269 | #endif |
| 258 | 270 | ||
| 259 | /* changes to device_may_wakeup take effect on the next pm state change. | 271 | /* changes to device_may_wakeup take effect on the next pm state change. |
