diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-31 21:40:03 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-31 21:40:03 +0200 |
| commit | 50ba22479c324c0d9dc8134d519dcba92d83a8a7 (patch) | |
| tree | 0f939779c7ff97d1b4e923a4fbded2718e09e4d3 /include/linux | |
| parent | 71b65445f0ed04c2afe3660f829779fddb2890c1 (diff) | |
| parent | 3431e490b50356b56084305a2e93b3a980802b22 (diff) | |
| download | op-kernel-dev-50ba22479c324c0d9dc8134d519dcba92d83a8a7.zip op-kernel-dev-50ba22479c324c0d9dc8134d519dcba92d83a8a7.tar.gz | |
Merge back earlier ACPI PM material for v4.3.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | include/linux/klist.h | 1 | ||||
| -rw-r--r-- | include/linux/pm_qos.h | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index a2b4ea7..9d212fe 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -959,6 +959,8 @@ extern int __must_check device_add(struct device *dev); extern void device_del(struct device *dev); extern int device_for_each_child(struct device *dev, void *data, int (*fn)(struct device *dev, void *data)); +extern int device_for_each_child_reverse(struct device *dev, void *data, + int (*fn)(struct device *dev, void *data)); extern struct device *device_find_child(struct device *dev, void *data, int (*match)(struct device *dev, void *data)); extern int device_rename(struct device *dev, const char *new_name); diff --git a/include/linux/klist.h b/include/linux/klist.h index 61e5b72..953f283 100644 --- a/include/linux/klist.h +++ b/include/linux/klist.h @@ -63,6 +63,7 @@ extern void klist_iter_init(struct klist *k, struct klist_iter *i); extern void klist_iter_init_node(struct klist *k, struct klist_iter *i, struct klist_node *n); extern void klist_iter_exit(struct klist_iter *i); +extern struct klist_node *klist_prev(struct klist_iter *i); extern struct klist_node *klist_next(struct klist_iter *i); #endif diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 7b3ae0c..0f65d36 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -161,6 +161,8 @@ void dev_pm_qos_hide_flags(struct device *dev); int dev_pm_qos_update_flags(struct device *dev, s32 mask, bool set); s32 dev_pm_qos_get_user_latency_tolerance(struct device *dev); int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val); +int dev_pm_qos_expose_latency_tolerance(struct device *dev); +void dev_pm_qos_hide_latency_tolerance(struct device *dev); static inline s32 dev_pm_qos_requested_resume_latency(struct device *dev) { @@ -229,6 +231,9 @@ static inline s32 dev_pm_qos_get_user_latency_tolerance(struct device *dev) { return PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT; } static inline int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val) { return 0; } +static inline int dev_pm_qos_expose_latency_tolerance(struct device *dev) + { return 0; } +static inline void dev_pm_qos_hide_latency_tolerance(struct device *dev) {} static inline s32 dev_pm_qos_requested_resume_latency(struct device *dev) { return 0; } static inline s32 dev_pm_qos_requested_flags(struct device *dev) { return 0; } |
