diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-27 09:28:56 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-27 09:28:56 +0800 |
| commit | 8f578bfefdd13d28d5baf3345405c46b101fe2f5 (patch) | |
| tree | bc5288ac0f07ba92943b48b8d490c7c5825a3fcd /include | |
| parent | 09681dfa554743041a3dbd9ca87a320c908c37f4 (diff) | |
| parent | d44ada516277f5d58b9bda2ea0a2c9503b316bbf (diff) | |
| download | linux-8f578bfefdd13d28d5baf3345405c46b101fe2f5.tar.gz linux-8f578bfefdd13d28d5baf3345405c46b101fe2f5.tar.bz2 linux-8f578bfefdd13d28d5baf3345405c46b101fe2f5.zip | |
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 @@ * cpufreq_cooling_register - function to create cpufreq cooling device. * @clip_cpus: cpumask of cpus where the frequency constraints will happen */ -struct thermal_cooling_device *cpufreq_cooling_register( - const struct cpumask *clip_cpus); +struct thermal_cooling_device * +cpufreq_cooling_register(const struct cpumask *clip_cpus); /** * cpufreq_cooling_unregister - function to remove cpufreq cooling device. @@ -43,18 +43,18 @@ 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) +static inline struct thermal_cooling_device * +cpufreq_cooling_register(const struct cpumask *clip_cpus) { return NULL; } -static inline void cpufreq_cooling_unregister( - struct thermal_cooling_device *cdev) +static inline +void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) { return; } -static inline unsigned long cpufreq_cooling_get_level(unsigned int, - unsigned int) +static inline +unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) { return THERMAL_CSTATE_INVALID; } |