diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-02-08 14:52:06 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-03-26 14:33:50 +0800 |
| commit | 57df8106932b57427df1eaaa13871857f75b1194 (patch) | |
| tree | 031702338779869067dde6be83aedeee9e8d6e2b /include | |
| parent | fc35b35cbe24ef021ea9acfba21e54da958df747 (diff) | |
| download | linux-stable-57df8106932b57427df1eaaa13871857f75b1194.tar.gz linux-stable-57df8106932b57427df1eaaa13871857f75b1194.tar.bz2 linux-stable-57df8106932b57427df1eaaa13871857f75b1194.zip | |
Thermal: exynos: fix cooling state translation
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Amit Daniel kachhap <amit.daniel@samsung.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpu_cooling.h | 7 | ||||
| -rw-r--r-- | include/linux/thermal.h | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index 40b4ef54cc7d..bc479b1e0fd9 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -42,6 +42,8 @@ struct thermal_cooling_device *cpufreq_cooling_register( * @cdev: thermal cooling device pointer. */ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); + +unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int); #else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device *cpufreq_cooling_register( const struct cpumask *clip_cpus) @@ -53,6 +55,11 @@ static inline void cpufreq_cooling_unregister( { return; } +static inline unsigned long cpufreq_cooling_get_level(unsigned int, + unsigned int) +{ + return THERMAL_CSTATE_INVALID; +} #endif /* CONFIG_CPU_THERMAL */ #endif /* __CPU_COOLING_H__ */ diff --git a/include/linux/thermal.h b/include/linux/thermal.h index f0bd7f90a90d..5a3b428daaab 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -33,8 +33,11 @@ #define THERMAL_MAX_TRIPS 12 #define THERMAL_NAME_LENGTH 20 +/* invalid cooling state */ +#define THERMAL_CSTATE_INVALID -1UL + /* No upper/lower limit requirement */ -#define THERMAL_NO_LIMIT -1UL +#define THERMAL_NO_LIMIT THERMAL_CSTATE_INVALID /* Unit conversion macros */ #define KELVIN_TO_CELSIUS(t) (long)(((long)t-2732 >= 0) ? \ |