1 files changed, 12 insertions, 16 deletions

diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
index 561758e95180..a748ce782fee 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
@@ -53,10 +53,6 @@ static struct cpufreq_frequency_table speedstep_freqs[] = {
 };
 
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "speedstep-ich", msg)
-
-
 /**
  * speedstep_find_register - read the PMBASE address
  *
@@ -80,7 +76,7 @@ static int speedstep_find_register(void)
                 return -ENODEV;
         }
 
-        dprintk("pmbase is 0x%x\n", pmbase);
+        pr_debug("pmbase is 0x%x\n", pmbase);
         return 0;
 }
 
@@ -106,13 +102,13 @@ static void speedstep_set_state(unsigned int state)
         /* read state */
         value = inb(pmbase + 0x50);
 
-        dprintk("read at pmbase 0x%x + 0x50 returned 0x%x\n", pmbase, value);
+        pr_debug("read at pmbase 0x%x + 0x50 returned 0x%x\n", pmbase, value);
 
         /* write new state */
         value &= 0xFE;
         value |= state;
 
-        dprintk("writing 0x%x to pmbase 0x%x + 0x50\n", value, pmbase);
+        pr_debug("writing 0x%x to pmbase 0x%x + 0x50\n", value, pmbase);
 
         /* Disable bus master arbitration */
         pm2_blk = inb(pmbase + 0x20);
@@ -132,10 +128,10 @@ static void speedstep_set_state(unsigned int state)
         /* Enable IRQs */
         local_irq_restore(flags);
 
-        dprintk("read at pmbase 0x%x + 0x50 returned 0x%x\n", pmbase, value);
+        pr_debug("read at pmbase 0x%x + 0x50 returned 0x%x\n", pmbase, value);
 
         if (state == (value & 0x1))
-                dprintk("change to %u MHz succeeded\n",
+                pr_debug("change to %u MHz succeeded\n",
                         speedstep_get_frequency(speedstep_processor) / 1000);
         else
                 printk(KERN_ERR "cpufreq: change failed - I/O error\n");
@@ -165,7 +161,7 @@ static int speedstep_activate(void)
         pci_read_config_word(speedstep_chipset_dev, 0x00A0, &value);
         if (!(value & 0x08)) {
                 value |= 0x08;
-                dprintk("activating SpeedStep (TM) registers\n");
+                pr_debug("activating SpeedStep (TM) registers\n");
                 pci_write_config_word(speedstep_chipset_dev, 0x00A0, value);
         }
 
@@ -218,7 +214,7 @@ static unsigned int speedstep_detect_chipset(void)
                         return 2; /* 2-M */
 
                 if (hostbridge->revision < 5) {
-                        dprintk("hostbridge does not support speedstep\n");
+                        pr_debug("hostbridge does not support speedstep\n");
                         speedstep_chipset_dev = NULL;
                         pci_dev_put(hostbridge);
                         return 0;
@@ -246,7 +242,7 @@ static unsigned int speedstep_get(unsigned int cpu)
         if (smp_call_function_single(cpu, get_freq_data, &speed, 1) != 0)
                 BUG();
 
-        dprintk("detected %u kHz as current frequency\n", speed);
+        pr_debug("detected %u kHz as current frequency\n", speed);
         return speed;
 }
 
@@ -276,7 +272,7 @@ static int speedstep_target(struct cpufreq_policy *policy,
         freqs.new = speedstep_freqs[newstate].frequency;
         freqs.cpu = policy->cpu;
 
-        dprintk("transiting from %u to %u kHz\n", freqs.old, freqs.new);
+        pr_debug("transiting from %u to %u kHz\n", freqs.old, freqs.new);
 
         /* no transition necessary */
         if (freqs.old == freqs.new)
@@ -351,7 +347,7 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
         if (!speed)
                 return -EIO;
 
-        dprintk("currently at %s speed setting - %i MHz\n",
+        pr_debug("currently at %s speed setting - %i MHz\n",
                 (speed == speedstep_freqs[SPEEDSTEP_LOW].frequency)
                 ? "low" : "high",
                 (speed / 1000));
@@ -405,14 +401,14 @@ static int __init speedstep_init(void)
         /* detect processor */
         speedstep_processor = speedstep_detect_processor();
         if (!speedstep_processor) {
-                dprintk("Intel(R) SpeedStep(TM) capable processor "
+                pr_debug("Intel(R) SpeedStep(TM) capable processor "
                                 "not found\n");
                 return -ENODEV;
         }
 
         /* detect chipset */
         if (!speedstep_detect_chipset()) {
-                dprintk("Intel(R) SpeedStep(TM) for this chipset not "
+                pr_debug("Intel(R) SpeedStep(TM) for this chipset not "
                                 "(yet) available.\n");
                 return -ENODEV;
         }