diff options
| -rw-r--r-- | include/linux/pm_qos.h | 41 | ||||
| -rw-r--r-- | kernel/power/Makefile | 3 |
2 files changed, 3 insertions, 41 deletions
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 67c521731f41..c8a541e13380 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h | |||
| @@ -67,7 +67,6 @@ static inline int dev_pm_qos_request_active(struct dev_pm_qos_request *req) | |||
| 67 | return req->dev != 0; | 67 | return req->dev != 0; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | #ifdef CONFIG_PM | ||
| 71 | int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node, | 70 | int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node, |
| 72 | enum pm_qos_req_action action, int value); | 71 | enum pm_qos_req_action action, int value); |
| 73 | void pm_qos_add_request(struct pm_qos_request *req, int pm_qos_class, | 72 | void pm_qos_add_request(struct pm_qos_request *req, int pm_qos_class, |
| @@ -82,6 +81,7 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier); | |||
| 82 | int pm_qos_request_active(struct pm_qos_request *req); | 81 | int pm_qos_request_active(struct pm_qos_request *req); |
| 83 | s32 pm_qos_read_value(struct pm_qos_constraints *c); | 82 | s32 pm_qos_read_value(struct pm_qos_constraints *c); |
| 84 | 83 | ||
| 84 | #ifdef CONFIG_PM | ||
| 85 | s32 __dev_pm_qos_read_value(struct device *dev); | 85 | s32 __dev_pm_qos_read_value(struct device *dev); |
| 86 | s32 dev_pm_qos_read_value(struct device *dev); | 86 | s32 dev_pm_qos_read_value(struct device *dev); |
| 87 | int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req, | 87 | int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req, |
| @@ -99,45 +99,6 @@ void dev_pm_qos_constraints_destroy(struct device *dev); | |||
| 99 | int dev_pm_qos_add_ancestor_request(struct device *dev, | 99 | int dev_pm_qos_add_ancestor_request(struct device *dev, |
| 100 | struct dev_pm_qos_request *req, s32 value); | 100 | struct dev_pm_qos_request *req, s32 value); |
| 101 | #else | 101 | #else |
| 102 | static inline int pm_qos_update_target(struct pm_qos_constraints *c, | ||
| 103 | struct plist_node *node, | ||
| 104 | enum pm_qos_req_action action, | ||
| 105 | int value) | ||
| 106 | { return 0; } | ||
| 107 | static inline void pm_qos_add_request(struct pm_qos_request *req, | ||
| 108 | int pm_qos_class, s32 value) | ||
| 109 | { return; } | ||
| 110 | static inline void pm_qos_update_request(struct pm_qos_request *req, | ||
| 111 | s32 new_value) | ||
| 112 | { return; } | ||
| 113 | static inline void pm_qos_remove_request(struct pm_qos_request *req) | ||
| 114 | { return; } | ||
| 115 | |||
| 116 | static inline int pm_qos_request(int pm_qos_class) | ||
| 117 | { | ||
| 118 | switch (pm_qos_class) { | ||
| 119 | case PM_QOS_CPU_DMA_LATENCY: | ||
| 120 | return PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE; | ||
| 121 | case PM_QOS_NETWORK_LATENCY: | ||
| 122 | return PM_QOS_NETWORK_LAT_DEFAULT_VALUE; | ||
| 123 | case PM_QOS_NETWORK_THROUGHPUT: | ||
| 124 | return PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE; | ||
| 125 | default: | ||
| 126 | return PM_QOS_DEFAULT_VALUE; | ||
| 127 | } | ||
| 128 | } | ||
| 129 | |||
| 130 | static inline int pm_qos_add_notifier(int pm_qos_class, | ||
| 131 | struct notifier_block *notifier) | ||
| 132 | { return 0; } | ||
| 133 | static inline int pm_qos_remove_notifier(int pm_qos_class, | ||
| 134 | struct notifier_block *notifier) | ||
| 135 | { return 0; } | ||
| 136 | static inline int pm_qos_request_active(struct pm_qos_request *req) | ||
| 137 | { return 0; } | ||
| 138 | static inline s32 pm_qos_read_value(struct pm_qos_constraints *c) | ||
| 139 | { return 0; } | ||
| 140 | |||
| 141 | static inline s32 __dev_pm_qos_read_value(struct device *dev) | 102 | static inline s32 __dev_pm_qos_read_value(struct device *dev) |
| 142 | { return 0; } | 103 | { return 0; } |
| 143 | static inline s32 dev_pm_qos_read_value(struct device *dev) | 104 | static inline s32 dev_pm_qos_read_value(struct device *dev) |
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 07e0e28ffba7..66d808ec5252 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | 1 | ||
| 2 | ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG | 2 | ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_PM) += main.o qos.o | 4 | obj-y += qos.o |
| 5 | obj-$(CONFIG_PM) += main.o | ||
| 5 | obj-$(CONFIG_VT_CONSOLE_SLEEP) += console.o | 6 | obj-$(CONFIG_VT_CONSOLE_SLEEP) += console.o |
| 6 | obj-$(CONFIG_FREEZER) += process.o | 7 | obj-$(CONFIG_FREEZER) += process.o |
| 7 | obj-$(CONFIG_SUSPEND) += suspend.o | 8 | obj-$(CONFIG_SUSPEND) += suspend.o |