Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[CPUFREQ] checkpatch cleanups for userspace governor

Signed-off-by: Dave Jones <davej@redhat.com>

+14 -13
+14 -13
drivers/cpufreq/cpufreq_userspace.c
··· 24 24 #include <linux/sysfs.h> 25 25 #include <linux/mutex.h> 26 26 27 - #include <asm/uaccess.h> 28 - 29 - 30 27 /** 31 28 * A few values needed by the userspace governor 32 29 */ ··· 34 37 userspace */ 35 38 static DEFINE_PER_CPU(unsigned int, cpu_is_managed); 36 39 37 - static DEFINE_MUTEX (userspace_mutex); 40 + static DEFINE_MUTEX(userspace_mutex); 38 41 static int cpus_using_userspace_governor; 39 42 40 43 #define dprintk(msg...) \ ··· 43 46 /* keep track of frequency transitions */ 44 47 static int 45 48 userspace_cpufreq_notifier(struct notifier_block *nb, unsigned long val, 46 - void *data) 49 + void *data) 47 50 { 48 - struct cpufreq_freqs *freq = data; 51 + struct cpufreq_freqs *freq = data; 49 52 50 53 if (!per_cpu(cpu_is_managed, freq->cpu)) 51 54 return 0; ··· 54 57 freq->cpu, freq->new); 55 58 per_cpu(cpu_cur_freq, freq->cpu) = freq->new; 56 59 57 - return 0; 60 + return 0; 58 61 } 59 62 60 63 static struct notifier_block userspace_cpufreq_notifier_block = { 61 - .notifier_call = userspace_cpufreq_notifier 64 + .notifier_call = userspace_cpufreq_notifier 62 65 }; 63 66 64 67 ··· 90 93 * We're safe from concurrent calls to ->target() here 91 94 * as we hold the userspace_mutex lock. If we were calling 92 95 * cpufreq_driver_target, a deadlock situation might occur: 93 - * A: cpufreq_set (lock userspace_mutex) -> cpufreq_driver_target(lock policy->lock) 94 - * B: cpufreq_set_policy(lock policy->lock) -> __cpufreq_governor -> cpufreq_governor_userspace (lock userspace_mutex) 96 + * A: cpufreq_set (lock userspace_mutex) -> 97 + * cpufreq_driver_target(lock policy->lock) 98 + * B: cpufreq_set_policy(lock policy->lock) -> 99 + * __cpufreq_governor -> 100 + * cpufreq_governor_userspace (lock userspace_mutex) 95 101 */ 96 102 ret = __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L); 97 103 ··· 210 210 } 211 211 212 212 213 - MODULE_AUTHOR ("Dominik Brodowski <linux@brodo.de>, Russell King <rmk@arm.linux.org.uk>"); 214 - MODULE_DESCRIPTION ("CPUfreq policy governor 'userspace'"); 215 - MODULE_LICENSE ("GPL"); 213 + MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>, " 214 + "Russell King <rmk@arm.linux.org.uk>"); 215 + MODULE_DESCRIPTION("CPUfreq policy governor 'userspace'"); 216 + MODULE_LICENSE("GPL"); 216 217 217 218 #ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE 218 219 fs_initcall(cpufreq_gov_userspace_init);