diff options
Diffstat (limited to 'drivers/cpufreq/cpufreq_userspace.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq_userspace.c | 13 | 
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/cpufreq/cpufreq_userspace.c b/drivers/cpufreq/cpufreq_userspace.c index 66d2d1d6c80..f231015904c 100644 --- a/drivers/cpufreq/cpufreq_userspace.c +++ b/drivers/cpufreq/cpufreq_userspace.c @@ -37,9 +37,6 @@ static DEFINE_PER_CPU(unsigned int, cpu_is_managed);  static DEFINE_MUTEX(userspace_mutex);  static int cpus_using_userspace_governor; -#define dprintk(msg...) \ -	cpufreq_debug_printk(CPUFREQ_DEBUG_GOVERNOR, "userspace", msg) -  /* keep track of frequency transitions */  static int  userspace_cpufreq_notifier(struct notifier_block *nb, unsigned long val, @@ -50,7 +47,7 @@ userspace_cpufreq_notifier(struct notifier_block *nb, unsigned long val,  	if (!per_cpu(cpu_is_managed, freq->cpu))  		return 0; -	dprintk("saving cpu_cur_freq of cpu %u to be %u kHz\n", +	pr_debug("saving cpu_cur_freq of cpu %u to be %u kHz\n",  			freq->cpu, freq->new);  	per_cpu(cpu_cur_freq, freq->cpu) = freq->new; @@ -73,7 +70,7 @@ static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq)  {  	int ret = -EINVAL; -	dprintk("cpufreq_set for cpu %u, freq %u kHz\n", policy->cpu, freq); +	pr_debug("cpufreq_set for cpu %u, freq %u kHz\n", policy->cpu, freq);  	mutex_lock(&userspace_mutex);  	if (!per_cpu(cpu_is_managed, policy->cpu)) @@ -134,7 +131,7 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,  		per_cpu(cpu_max_freq, cpu) = policy->max;  		per_cpu(cpu_cur_freq, cpu) = policy->cur;  		per_cpu(cpu_set_freq, cpu) = policy->cur; -		dprintk("managing cpu %u started " +		pr_debug("managing cpu %u started "  			"(%u - %u kHz, currently %u kHz)\n",  				cpu,  				per_cpu(cpu_min_freq, cpu), @@ -156,12 +153,12 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy,  		per_cpu(cpu_min_freq, cpu) = 0;  		per_cpu(cpu_max_freq, cpu) = 0;  		per_cpu(cpu_set_freq, cpu) = 0; -		dprintk("managing cpu %u stopped\n", cpu); +		pr_debug("managing cpu %u stopped\n", cpu);  		mutex_unlock(&userspace_mutex);  		break;  	case CPUFREQ_GOV_LIMITS:  		mutex_lock(&userspace_mutex); -		dprintk("limit event for cpu %u: %u - %u kHz, " +		pr_debug("limit event for cpu %u: %u - %u kHz, "  			"currently %u kHz, last set to %u kHz\n",  			cpu, policy->min, policy->max,  			per_cpu(cpu_cur_freq, cpu),  |