aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-02-08 01:52:06 -0500
committerZhang Rui <rui.zhang@intel.com>2013-03-26 02:33:50 -0400
commit57df8106932b57427df1eaaa13871857f75b1194 (patch)
tree031702338779869067dde6be83aedeee9e8d6e2b /include/linux
parentfc35b35cbe24ef021ea9acfba21e54da958df747 (diff)
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/linux')
-rw-r--r--include/linux/cpu_cooling.h7
-rw-r--r--include/linux/thermal.h5
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(
42 * @cdev: thermal cooling device pointer. 42 * @cdev: thermal cooling device pointer.
43 */ 43 */
44void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); 44void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev);
45
46unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int);
45#else /* !CONFIG_CPU_THERMAL */ 47#else /* !CONFIG_CPU_THERMAL */
46static inline struct thermal_cooling_device *cpufreq_cooling_register( 48static inline struct thermal_cooling_device *cpufreq_cooling_register(
47 const struct cpumask *clip_cpus) 49 const struct cpumask *clip_cpus)
@@ -53,6 +55,11 @@ static inline void cpufreq_cooling_unregister(
53{ 55{
54 return; 56 return;
55} 57}
58static inline unsigned long cpufreq_cooling_get_level(unsigned int,
59 unsigned int)
60{
61 return THERMAL_CSTATE_INVALID;
62}
56#endif /* CONFIG_CPU_THERMAL */ 63#endif /* CONFIG_CPU_THERMAL */
57 64
58#endif /* __CPU_COOLING_H__ */ 65#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 @@
33#define THERMAL_MAX_TRIPS 12 33#define THERMAL_MAX_TRIPS 12
34#define THERMAL_NAME_LENGTH 20 34#define THERMAL_NAME_LENGTH 20
35 35
36/* invalid cooling state */
37#define THERMAL_CSTATE_INVALID -1UL
38
36/* No upper/lower limit requirement */ 39/* No upper/lower limit requirement */
37#define THERMAL_NO_LIMIT -1UL 40#define THERMAL_NO_LIMIT THERMAL_CSTATE_INVALID
38 41
39/* Unit conversion macros */ 42/* Unit conversion macros */
40#define KELVIN_TO_CELSIUS(t) (long)(((long)t-2732 >= 0) ? \ 43#define KELVIN_TO_CELSIUS(t) (long)(((long)t-2732 >= 0) ? \