diff options
| author | Javi Merino <javi.merino@arm.com> | 2014-12-17 06:11:24 -0500 |
|---|---|---|
| committer | Eduardo Valentin <edubezval@gmail.com> | 2014-12-17 08:00:04 -0500 |
| commit | 503ccc3fec4a56cdcfedc507cd1ea0d85e1fbfa2 (patch) | |
| tree | 1d2e39ee5a9eb3bf24f02fa9eb8754826ee57859 /include/linux/cpu_cooling.h | |
| parent | 2d2e95ea8f124869b96ad929d1701bd64844a06a (diff) | |
thermal: cpu_cooling: return ERR_PTR() for !CPU_THERMAL or !THERMAL_OF
The documentation of of_cpufreq_cooling_register() and
cpufreq_cooling_register() say that they return ERR_PTR() on error.
Accordingly, callers only check for IS_ERR(). Therefore, make them
return ERR_PTR(-ENOSYS) as is customary in the kernel when config
options are missing.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'include/linux/cpu_cooling.h')
| -rw-r--r-- | include/linux/cpu_cooling.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index c303d383def1..bd955270d5aa 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h | |||
| @@ -50,7 +50,7 @@ static inline struct thermal_cooling_device * | |||
| 50 | of_cpufreq_cooling_register(struct device_node *np, | 50 | of_cpufreq_cooling_register(struct device_node *np, |
| 51 | const struct cpumask *clip_cpus) | 51 | const struct cpumask *clip_cpus) |
| 52 | { | 52 | { |
| 53 | return NULL; | 53 | return ERR_PTR(-ENOSYS); |
| 54 | } | 54 | } |
| 55 | #endif | 55 | #endif |
| 56 | 56 | ||
| @@ -65,13 +65,13 @@ unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq); | |||
| 65 | static inline struct thermal_cooling_device * | 65 | static inline struct thermal_cooling_device * |
| 66 | cpufreq_cooling_register(const struct cpumask *clip_cpus) | 66 | cpufreq_cooling_register(const struct cpumask *clip_cpus) |
| 67 | { | 67 | { |
| 68 | return NULL; | 68 | return ERR_PTR(-ENOSYS); |
| 69 | } | 69 | } |
| 70 | static inline struct thermal_cooling_device * | 70 | static inline struct thermal_cooling_device * |
| 71 | of_cpufreq_cooling_register(struct device_node *np, | 71 | of_cpufreq_cooling_register(struct device_node *np, |
| 72 | const struct cpumask *clip_cpus) | 72 | const struct cpumask *clip_cpus) |
| 73 | { | 73 | { |
| 74 | return NULL; | 74 | return ERR_PTR(-ENOSYS); |
| 75 | } | 75 | } |
| 76 | static inline | 76 | static inline |
| 77 | void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) | 77 | void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) |
