diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-26 21:28:56 -0400 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-26 21:28:56 -0400 |
| commit | 8f578bfefdd13d28d5baf3345405c46b101fe2f5 (patch) | |
| tree | bc5288ac0f07ba92943b48b8d490c7c5825a3fcd /include | |
| parent | 09681dfa554743041a3dbd9ca87a320c908c37f4 (diff) | |
| parent | d44ada516277f5d58b9bda2ea0a2c9503b316bbf (diff) | |
Merge branch 'cpu_cooling-doc-comments-update' of .git into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpu_cooling.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index f48f6fbcd3be..282e27028418 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h | |||
| @@ -32,8 +32,8 @@ | |||
| 32 | * cpufreq_cooling_register - function to create cpufreq cooling device. | 32 | * cpufreq_cooling_register - function to create cpufreq cooling device. |
| 33 | * @clip_cpus: cpumask of cpus where the frequency constraints will happen | 33 | * @clip_cpus: cpumask of cpus where the frequency constraints will happen |
| 34 | */ | 34 | */ |
| 35 | struct thermal_cooling_device *cpufreq_cooling_register( | 35 | struct thermal_cooling_device * |
| 36 | const struct cpumask *clip_cpus); | 36 | cpufreq_cooling_register(const struct cpumask *clip_cpus); |
| 37 | 37 | ||
| 38 | /** | 38 | /** |
| 39 | * cpufreq_cooling_unregister - function to remove cpufreq cooling device. | 39 | * cpufreq_cooling_unregister - function to remove cpufreq cooling device. |
| @@ -43,18 +43,18 @@ 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, unsigned int); |
| 45 | #else /* !CONFIG_CPU_THERMAL */ | 45 | #else /* !CONFIG_CPU_THERMAL */ |
| 46 | static inline struct thermal_cooling_device *cpufreq_cooling_register( | 46 | static inline struct thermal_cooling_device * |
| 47 | const struct cpumask *clip_cpus) | 47 | cpufreq_cooling_register(const struct cpumask *clip_cpus) |
| 48 | { | 48 | { |
| 49 | return NULL; | 49 | return NULL; |
| 50 | } | 50 | } |
| 51 | static inline void cpufreq_cooling_unregister( | 51 | static inline |
| 52 | struct thermal_cooling_device *cdev) | 52 | void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) |
| 53 | { | 53 | { |
| 54 | return; | 54 | return; |
| 55 | } | 55 | } |
| 56 | static inline unsigned long cpufreq_cooling_get_level(unsigned int, | 56 | static inline |
| 57 | unsigned int) | 57 | unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) |
| 58 | { | 58 | { |
| 59 | return THERMAL_CSTATE_INVALID; | 59 | return THERMAL_CSTATE_INVALID; |
| 60 | } | 60 | } |