Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] remove redundant sprintf from request_module call.
  [CPUFREQ] cpufreq_stats.c: Fixed brace coding style issue
  [CPUFREQ] Fix memory leak in cpufreq_stat
  [CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.
  [CPUFREQ] use dynamic debug instead of custom infrastructure
  [CPUFREQ] CPU hotplug, re-create sysfs directory and symlinks
  [CPUFREQ] Fix _OSC UUID in pcc-cpufreq

1 files changed, 10 insertions, 13 deletions

diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
index 9b1ff37de46a..6ea3455def21 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -29,9 +29,6 @@
 #define PFX             "speedstep-centrino: "
 #define MAINTAINER      "cpufreq@vger.kernel.org"
 
-#define dprintk(msg...) \
-        cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)
-
 #define INTEL_MSR_RANGE (0xffff)
 
 struct cpu_id
@@ -244,7 +241,7 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy)
 
         if (model->cpu_id == NULL) {
                 /* No match at all */
-                dprintk("no support for CPU model \"%s\": "
+                pr_debug("no support for CPU model \"%s\": "
                        "send /proc/cpuinfo to " MAINTAINER "\n",
                        cpu->x86_model_id);
                 return -ENOENT;
@@ -252,15 +249,15 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy)
 
         if (model->op_points == NULL) {
                 /* Matched a non-match */
-                dprintk("no table support for CPU model \"%s\"\n",
+                pr_debug("no table support for CPU model \"%s\"\n",
                        cpu->x86_model_id);
-                dprintk("try using the acpi-cpufreq driver\n");
+                pr_debug("try using the acpi-cpufreq driver\n");
                 return -ENOENT;
         }
 
         per_cpu(centrino_model, policy->cpu) = model;
 
-        dprintk("found \"%s\": max frequency: %dkHz\n",
+        pr_debug("found \"%s\": max frequency: %dkHz\n",
                model->model_name, model->max_freq);
 
         return 0;
@@ -369,7 +366,7 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
                 per_cpu(centrino_cpu, policy->cpu) = &cpu_ids[i];
 
         if (!per_cpu(centrino_cpu, policy->cpu)) {
-                dprintk("found unsupported CPU with "
+                pr_debug("found unsupported CPU with "
                 "Enhanced SpeedStep: send /proc/cpuinfo to "
                 MAINTAINER "\n");
                 return -ENODEV;
@@ -385,7 +382,7 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
 
         if (!(l & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
                 l |= MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP;
-                dprintk("trying to enable Enhanced SpeedStep (%x)\n", l);
+                pr_debug("trying to enable Enhanced SpeedStep (%x)\n", l);
                 wrmsr(MSR_IA32_MISC_ENABLE, l, h);
 
                 /* check to see if it stuck */
@@ -402,7 +399,7 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
                                                 /* 10uS transition latency */
         policy->cur = freq;
 
-        dprintk("centrino_cpu_init: cur=%dkHz\n", policy->cur);
+        pr_debug("centrino_cpu_init: cur=%dkHz\n", policy->cur);
 
         ret = cpufreq_frequency_table_cpuinfo(policy,
                 per_cpu(centrino_model, policy->cpu)->op_points);
@@ -498,7 +495,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                         good_cpu = j;
 
                 if (good_cpu >= nr_cpu_ids) {
-                        dprintk("couldn't limit to CPUs in this domain\n");
+                        pr_debug("couldn't limit to CPUs in this domain\n");
                         retval = -EAGAIN;
                         if (first_cpu) {
                                 /* We haven't started the transition yet. */
@@ -512,7 +509,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                 if (first_cpu) {
                         rdmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, &oldmsr, &h);
                         if (msr == (oldmsr & 0xffff)) {
-                                dprintk("no change needed - msr was and needs "
+                                pr_debug("no change needed - msr was and needs "
                                         "to be %x\n", oldmsr);
                                 retval = 0;
                                 goto out;
@@ -521,7 +518,7 @@ static int centrino_target (struct cpufreq_policy *policy,
                         freqs.old = extract_clock(oldmsr, cpu, 0);
                         freqs.new = extract_clock(msr, cpu, 0);
 
-                        dprintk("target=%dkHz old=%d new=%d msr=%04x\n",
+                        pr_debug("target=%dkHz old=%d new=%d msr=%04x\n",
                                 target_freq, freqs.old, freqs.new, msr);
 
                         for_each_cpu(k, policy->cpus) {