Change the return type of pm_qos_request() to be the same as the one of pm_qos_read_value() called by it internally and stop exporting it to modules (because its only caller, cpuidle, is not modular). Also move the pm_qos_read_value() header away from the CPU latency QoS API function headers in pm_qos.h (because it technically does not belong to that API). No intentional functional impact.
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -137,20 +137,20 @@ static inline int dev_pm_qos_request_active(struct dev_pm_qos_request *req) · 136 unmodified lines | |||
| 137 | return req->dev != NULL; | 137 | return req->dev != NULL; |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | s32 pm_qos_read_value(struct pm_qos_constraints *c); | ||
| 140 | int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node, | 141 | int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node, |
| 141 | enum pm_qos_req_action action, int value); | 142 | enum pm_qos_req_action action, int value); |
| 142 | bool pm_qos_update_flags(struct pm_qos_flags *pqf, | 143 | bool pm_qos_update_flags(struct pm_qos_flags *pqf, |
| 143 | struct pm_qos_flags_request *req, | 144 | struct pm_qos_flags_request *req, |
| 144 | enum pm_qos_req_action action, s32 val); | 145 | enum pm_qos_req_action action, s32 val); |
| 146 | |||
| 145 | void pm_qos_add_request(struct pm_qos_request *req, int pm_qos_class, | 147 | void pm_qos_add_request(struct pm_qos_request *req, int pm_qos_class, |
| 146 | s32 value); | 148 | s32 value); |
| 147 | void pm_qos_update_request(struct pm_qos_request *req, | 149 | void pm_qos_update_request(struct pm_qos_request *req, |
| 148 | s32 new_value); | 150 | s32 new_value); |
| 149 | void pm_qos_remove_request(struct pm_qos_request *req); | 151 | void pm_qos_remove_request(struct pm_qos_request *req); |
| 150 | 152 | s32 pm_qos_request(int pm_qos_class); | |
| 151 | int pm_qos_request(int pm_qos_class); | ||
| 152 | int pm_qos_request_active(struct pm_qos_request *req); | 153 | int pm_qos_request_active(struct pm_qos_request *req); |
| 153 | s32 pm_qos_read_value(struct pm_qos_constraints *c); | ||
| 154 | 154 | ||
| 155 | #ifdef CONFIG_PM | 155 | #ifdef CONFIG_PM |
| 156 | enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask); | 156 | enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask); |