diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-07-05 11:40:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 17:07:42 -0400 |
| commit | d8724a91bc631690af241588936971214e55927e (patch) | |
| tree | b53f7cd83673d49521949dc41bd5c062efaf52c5 /include | |
| parent | 3ea8ad44cea35afc010942b448472fc993f24722 (diff) | |
thermal: cpu_cooling: fix stub function
commit e8d39240d635ed9bcaddbec898b1c9f063c5dbb2 upstream.
The function stub for cpufreq_cooling_get_level introduced
in 57df81069 "Thermal: exynos: fix cooling state translation"
is not syntactically correct C and needs to be fixed to avoid
this error:
In file included from drivers/thermal/db8500_thermal.c:20:0:
include/linux/cpu_cooling.h: In function 'cpufreq_cooling_get_level':
include/linux/cpu_cooling.h:57:1:
error: parameter name omitted unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) ^
include/linux/cpu_cooling.h:57:1: error: parameter name omitted
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Amit Daniel kachhap <amit.daniel@samsung.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpu_cooling.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index 282e27028418..a5d52eea8232 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h | |||
| @@ -41,7 +41,7 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus); | |||
| 41 | */ | 41 | */ |
| 42 | void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); | 42 | void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); |
| 43 | 43 | ||
| 44 | unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int); | 44 | unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq); |
| 45 | #else /* !CONFIG_CPU_THERMAL */ | 45 | #else /* !CONFIG_CPU_THERMAL */ |
| 46 | static inline struct thermal_cooling_device * | 46 | static inline struct thermal_cooling_device * |
| 47 | cpufreq_cooling_register(const struct cpumask *clip_cpus) | 47 | cpufreq_cooling_register(const struct cpumask *clip_cpus) |
| @@ -54,7 +54,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) | |||
| 54 | return; | 54 | return; |
| 55 | } | 55 | } |
| 56 | static inline | 56 | static inline |
| 57 | unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) | 57 | unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq) |
| 58 | { | 58 | { |
| 59 | return THERMAL_CSTATE_INVALID; | 59 | return THERMAL_CSTATE_INVALID; |
| 60 | } | 60 | } |
