Commit 99e98d3fb100 ("cpuidle: Consolidate disabled state checks") overlooked the fact that the imx6q and tegra20 cpuidle drivers use the "disabled" field in struct cpuidle_state for quirks which trigger after the initialization of cpuidle, so reading the initial value of that field is not sufficient for those drivers. In order to allow them to implement the quirks without using the "disabled" field in struct cpuidle_state, introduce a new helper function and modify them to use it.
Showing the changes to include/linux (1 of 4 files). Show all
Unified · Split
| @@ -149,6 +149,8 @@ extern int cpuidle_register_driver(struct cpuidle_driver *drv); · 148 unmodified lines | |||
| 149 | extern struct cpuidle_driver *cpuidle_get_driver(void); | 149 | extern struct cpuidle_driver *cpuidle_get_driver(void); |
| 150 | extern struct cpuidle_driver *cpuidle_driver_ref(void); | 150 | extern struct cpuidle_driver *cpuidle_driver_ref(void); |
| 151 | extern void cpuidle_driver_unref(void); | 151 | extern void cpuidle_driver_unref(void); |
| 152 | extern void cpuidle_driver_state_disabled(struct cpuidle_driver *drv, int idx, | ||
| 153 | bool disable); | ||
| 152 | extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); | 154 | extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); |
| 153 | extern int cpuidle_register_device(struct cpuidle_device *dev); | 155 | extern int cpuidle_register_device(struct cpuidle_device *dev); |
| 154 | extern void cpuidle_unregister_device(struct cpuidle_device *dev); | 156 | extern void cpuidle_unregister_device(struct cpuidle_device *dev); |
| @@ -186,6 +188,8 @@ static inline int cpuidle_register_driver(struct cpuidle_driver *drv) · 31 unmodified lines | |||
| 186 | static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; } | 188 | static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; } |
| 187 | static inline struct cpuidle_driver *cpuidle_driver_ref(void) {return NULL; } | 189 | static inline struct cpuidle_driver *cpuidle_driver_ref(void) {return NULL; } |
| 188 | static inline void cpuidle_driver_unref(void) {} | 190 | static inline void cpuidle_driver_unref(void) {} |
| 191 | static inline void cpuidle_driver_state_disabled(struct cpuidle_driver *drv, | ||
| 192 | int idx, bool disable) { } | ||
| 189 | static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { } | 193 | static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { } |
| 190 | static inline int cpuidle_register_device(struct cpuidle_device *dev) | 194 | static inline int cpuidle_register_device(struct cpuidle_device *dev) |
| 191 | {return -ENODEV; } | 195 | {return -ENODEV; } |