25 files changed, 181 insertions, 146 deletions

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index ed9e93df7ecf..67a612e22179 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -25,6 +25,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -50,8 +52,6 @@ MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski");
 MODULE_DESCRIPTION("ACPI Processor P-States Driver");
 MODULE_LICENSE("GPL");
 
-#define PFX "acpi-cpufreq: "
-
 enum {
         UNDEFINED_CAPABLE = 0,
         SYSTEM_INTEL_MSR_CAPABLE,
@@ -648,7 +648,7 @@ static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
                 if ((c->x86 == 15) &&
                     (c->x86_model == 6) &&
                     (c->x86_mask == 8)) {
-                        pr_info("acpi-cpufreq: Intel(R) Xeon(R) 7100 Errata AL30, processors may lock up on frequency changes: disabling acpi-cpufreq\n");
+                        pr_info("Intel(R) Xeon(R) 7100 Errata AL30, processors may lock up on frequency changes: disabling acpi-cpufreq\n");
                         return -ENODEV;
                     }
                 }
@@ -724,7 +724,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 cpumask_copy(data->freqdomain_cpus,
                              topology_sibling_cpumask(cpu));
                 policy->shared_type = CPUFREQ_SHARED_TYPE_HW;
-                pr_info_once(PFX "overriding BIOS provided _PSD data\n");
+                pr_info_once("overriding BIOS provided _PSD data\n");
         }
 #endif
 
diff --git a/drivers/cpufreq/cpufreq-nforce2.c b/drivers/cpufreq/cpufreq-nforce2.c
index 7da96d536ac9..5503d491b016 100644
--- a/drivers/cpufreq/cpufreq-nforce2.c
+++ b/drivers/cpufreq/cpufreq-nforce2.c
@@ -7,6 +7,8 @@
  *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -56,8 +58,6 @@ MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)");
 MODULE_PARM_DESC(min_fsb,
                 "Minimum FSB to use, if not defined: current FSB - 50");
 
-#define PFX "cpufreq-nforce2: "
-
 /**
  * nforce2_calc_fsb - calculate FSB
  * @pll: PLL value
@@ -174,13 +174,13 @@ static int nforce2_set_fsb(unsigned int fsb)
         int pll = 0;
 
         if ((fsb > max_fsb) || (fsb < NFORCE2_MIN_FSB)) {
-                pr_err(PFX "FSB %d is out of range!\n", fsb);
+                pr_err("FSB %d is out of range!\n", fsb);
                 return -EINVAL;
         }
 
         tfsb = nforce2_fsb_read(0);
         if (!tfsb) {
-                pr_err(PFX "Error while reading the FSB\n");
+                pr_err("Error while reading the FSB\n");
                 return -EINVAL;
         }
 
@@ -276,7 +276,7 @@ static int nforce2_target(struct cpufreq_policy *policy,
         /* local_irq_save(flags); */
 
         if (nforce2_set_fsb(target_fsb) < 0)
-                pr_err(PFX "Changing FSB to %d failed\n", target_fsb);
+                pr_err("Changing FSB to %d failed\n", target_fsb);
         else
                 pr_debug("Changed FSB successfully to %d\n",
                         target_fsb);
@@ -324,7 +324,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)
         /* FIX: Get FID from CPU */
         if (!fid) {
                 if (!cpu_khz) {
-                        pr_warn(PFX "cpu_khz not set, can't calculate multiplier!\n");
+                        pr_warn("cpu_khz not set, can't calculate multiplier!\n");
                         return -ENODEV;
                 }
 
@@ -339,7 +339,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy)
                 }
         }
 
-        pr_info(PFX "FSB currently at %i MHz, FID %d.%d\n",
+        pr_info("FSB currently at %i MHz, FID %d.%d\n",
                 fsb, fid / 10, fid % 10);
 
         /* Set maximum FSB to FSB at boot time */
@@ -399,9 +399,9 @@ static int nforce2_detect_chipset(void)
         if (nforce2_dev == NULL)
                 return -ENODEV;
 
-        pr_info(PFX "Detected nForce2 chipset revision %X\n",
+        pr_info("Detected nForce2 chipset revision %X\n",
                 nforce2_dev->revision);
-        pr_info(PFX "FSB changing is maybe unstable and can lead to crashes and data loss\n");
+        pr_info("FSB changing is maybe unstable and can lead to crashes and data loss\n");
 
         return 0;
 }
@@ -419,7 +419,7 @@ static int __init nforce2_init(void)
 
         /* detect chipset */
         if (nforce2_detect_chipset()) {
-                pr_info(PFX "No nForce2 chipset\n");
+                pr_info("No nForce2 chipset\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c
index c420f0cb46a7..5ec87e3a97bd 100644
--- a/drivers/cpufreq/e_powersaver.c
+++ b/drivers/cpufreq/e_powersaver.c
@@ -6,6 +6,8 @@
  *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -141,9 +143,9 @@ static int eps_set_state(struct eps_cpu_data *centaur,
         /* Print voltage and multiplier */
         rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
         current_voltage = lo & 0xff;
-        pr_info("eps: Current voltage = %dmV\n", current_voltage * 16 + 700);
+        pr_info("Current voltage = %dmV\n", current_voltage * 16 + 700);
         current_multiplier = (lo >> 8) & 0xff;
-        pr_info("eps: Current multiplier = %d\n", current_multiplier);
+        pr_info("Current multiplier = %d\n", current_multiplier);
         }
 #endif
         return 0;
@@ -164,7 +166,7 @@ static int eps_target(struct cpufreq_policy *policy, unsigned int index)
         dest_state = centaur->freq_table[index].driver_data & 0xffff;
         ret = eps_set_state(centaur, policy, dest_state);
         if (ret)
-                pr_err("eps: Timeout!\n");
+                pr_err("Timeout!\n");
         return ret;
 }
 
@@ -192,7 +194,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
                 return -ENODEV;
 
         /* Check brand */
-        pr_info("eps: Detected VIA ");
+        pr_info("Detected VIA ");
 
         switch (c->x86_model) {
         case 10:
@@ -233,7 +235,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
                 /* Can be locked at 0 */
                 rdmsrl(MSR_IA32_MISC_ENABLE, val);
                 if (!(val & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
-                        pr_info("eps: Can't enable Enhanced PowerSaver\n");
+                        pr_info("Can't enable Enhanced PowerSaver\n");
                         return -ENODEV;
                 }
         }
@@ -241,19 +243,19 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
         /* Print voltage and multiplier */
         rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
         current_voltage = lo & 0xff;
-        pr_info("eps: Current voltage = %dmV\n", current_voltage * 16 + 700);
+        pr_info("Current voltage = %dmV\n", current_voltage * 16 + 700);
         current_multiplier = (lo >> 8) & 0xff;
-        pr_info("eps: Current multiplier = %d\n", current_multiplier);
+        pr_info("Current multiplier = %d\n", current_multiplier);
 
         /* Print limits */
         max_voltage = hi & 0xff;
-        pr_info("eps: Highest voltage = %dmV\n", max_voltage * 16 + 700);
+        pr_info("Highest voltage = %dmV\n", max_voltage * 16 + 700);
         max_multiplier = (hi >> 8) & 0xff;
-        pr_info("eps: Highest multiplier = %d\n", max_multiplier);
+        pr_info("Highest multiplier = %d\n", max_multiplier);
         min_voltage = (hi >> 16) & 0xff;
-        pr_info("eps: Lowest voltage = %dmV\n", min_voltage * 16 + 700);
+        pr_info("Lowest voltage = %dmV\n", min_voltage * 16 + 700);
         min_multiplier = (hi >> 24) & 0xff;
-        pr_info("eps: Lowest multiplier = %d\n", min_multiplier);
+        pr_info("Lowest multiplier = %d\n", min_multiplier);
 
         /* Sanity checks */
         if (current_multiplier == 0 || max_multiplier == 0
@@ -271,13 +273,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
 
         /* Check for systems using underclocked CPU */
         if (!freq_failsafe_off && max_multiplier != current_multiplier) {
-                pr_info("eps: Your processor is running at different frequency then its maximum. Aborting.\n");
-                pr_info("eps: You can use freq_failsafe_off option to disable this check.\n");
+                pr_info("Your processor is running at different frequency then its maximum. Aborting.\n");
+                pr_info("You can use freq_failsafe_off option to disable this check.\n");
                 return -EINVAL;
         }
         if (!voltage_failsafe_off && max_voltage != current_voltage) {
-                pr_info("eps: Your processor is running at different voltage then its maximum. Aborting.\n");
-                pr_info("eps: You can use voltage_failsafe_off option to disable this check.\n");
+                pr_info("Your processor is running at different voltage then its maximum. Aborting.\n");
+                pr_info("You can use voltage_failsafe_off option to disable this check.\n");
                 return -EINVAL;
         }
 
@@ -288,13 +290,13 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
         /* Check for ACPI processor speed limit */
         if (!ignore_acpi_limit && !eps_acpi_init()) {
                 if (!acpi_processor_get_bios_limit(policy->cpu, &limit)) {
-                        pr_info("eps: ACPI limit %u.%uGHz\n",
+                        pr_info("ACPI limit %u.%uGHz\n",
                                 limit/1000000,
                                 (limit%1000000)/10000);
                         eps_acpi_exit(policy);
                         /* Check if max_multiplier is in BIOS limits */
                         if (limit && max_multiplier * fsb > limit) {
-                                pr_info("eps: Aborting\n");
+                                pr_info("Aborting\n");
                                 return -EINVAL;
                         }
                 }
@@ -310,7 +312,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
                 v = (set_max_voltage - 700) / 16;
                 /* Check if voltage is within limits */
                 if (v >= min_voltage && v <= max_voltage) {
-                        pr_info("eps: Setting %dmV as maximum\n", v * 16 + 700);
+                        pr_info("Setting %dmV as maximum\n", v * 16 + 700);
                         max_voltage = v;
                 }
         }
diff --git a/drivers/cpufreq/elanfreq.c b/drivers/cpufreq/elanfreq.c
index 8f4dded3016f..bfce11cba1df 100644
--- a/drivers/cpufreq/elanfreq.c
+++ b/drivers/cpufreq/elanfreq.c
@@ -16,6 +16,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/cpufreq/ia64-acpi-cpufreq.c b/drivers/cpufreq/ia64-acpi-cpufreq.c
index fd36d6cd3787..759612da4fdc 100644
--- a/drivers/cpufreq/ia64-acpi-cpufreq.c
+++ b/drivers/cpufreq/ia64-acpi-cpufreq.c
@@ -8,6 +8,8 @@
  *      Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -290,8 +292,7 @@ acpi_cpufreq_cpu_init (
         /* notify BIOS that we exist */
         acpi_processor_notify_smm(THIS_MODULE);
 
-        pr_info("acpi-cpufreq: CPU%u - ACPI performance management activated\n",
-                cpu);
+        pr_info("CPU%u - ACPI performance management activated\n", cpu);
 
         for (i = 0; i < data->acpi_data.state_count; i++)
                 pr_debug("     %cP%d: %d MHz, %d mW, %d uS, %d uS, 0x%x 0x%x\n",
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index 2baeb8c01474..beae5cf5c62c 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -21,6 +21,8 @@
  *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -40,8 +42,6 @@
 
 #include "longhaul.h"
 
-#define PFX "longhaul: "
-
 #define TYPE_LONGHAUL_V1        1
 #define TYPE_LONGHAUL_V2        2
 #define TYPE_POWERSAVER         3
@@ -347,13 +347,13 @@ retry_loop:
         freqs.new = calc_speed(longhaul_get_cpu_mult());
         /* Check if requested frequency is set. */
         if (unlikely(freqs.new != speed)) {
-                pr_info(PFX "Failed to set requested frequency!\n");
+                pr_info("Failed to set requested frequency!\n");
                 /* Revision ID = 1 but processor is expecting revision key
                  * equal to 0. Jumpers at the bottom of processor will change
                  * multiplier and FSB, but will not change bits in Longhaul
                  * MSR nor enable voltage scaling. */
                 if (!revid_errata) {
-                        pr_info(PFX "Enabling \"Ignore Revision ID\" option\n");
+                        pr_info("Enabling \"Ignore Revision ID\" option\n");
                         revid_errata = 1;
                         msleep(200);
                         goto retry_loop;
@@ -363,10 +363,10 @@ retry_loop:
                  * but it doesn't change frequency. I tried poking various
                  * bits in northbridge registers, but without success. */
                 if (longhaul_flags & USE_ACPI_C3) {
-                        pr_info(PFX "Disabling ACPI C3 support\n");
+                        pr_info("Disabling ACPI C3 support\n");
                         longhaul_flags &= ~USE_ACPI_C3;
                         if (revid_errata) {
-                                pr_info(PFX "Disabling \"Ignore Revision ID\" option\n");
+                                pr_info("Disabling \"Ignore Revision ID\" option\n");
                                 revid_errata = 0;
                         }
                         msleep(200);
@@ -377,7 +377,7 @@ retry_loop:
                  * RevID = 1. RevID errata will make things right. Just
                  * to be 100% sure. */
                 if (longhaul_version == TYPE_LONGHAUL_V2) {
-                        pr_info(PFX "Switching to Longhaul ver. 1\n");
+                        pr_info("Switching to Longhaul ver. 1\n");
                         longhaul_version = TYPE_LONGHAUL_V1;
                         msleep(200);
                         goto retry_loop;
@@ -385,7 +385,7 @@ retry_loop:
         }
 
         if (!bm_timeout) {
-                pr_info(PFX "Warning: Timeout while waiting for idle PCI bus\n");
+                pr_info("Warning: Timeout while waiting for idle PCI bus\n");
                 return -EBUSY;
         }
 
@@ -430,12 +430,12 @@ static int longhaul_get_ranges(void)
         /* Get current frequency */
         mult = longhaul_get_cpu_mult();
         if (mult == -1) {
-                pr_info(PFX "Invalid (reserved) multiplier!\n");
+                pr_info("Invalid (reserved) multiplier!\n");
                 return -EINVAL;
         }
         fsb = guess_fsb(mult);
         if (fsb == 0) {
-                pr_info(PFX "Invalid (reserved) FSB!\n");
+                pr_info("Invalid (reserved) FSB!\n");
                 return -EINVAL;
         }
         /* Get max multiplier - as we always did.
@@ -465,11 +465,11 @@ static int longhaul_get_ranges(void)
                  print_speed(highest_speed/1000));
 
         if (lowest_speed == highest_speed) {
-                pr_info(PFX "highestspeed == lowest, aborting\n");
+                pr_info("highestspeed == lowest, aborting\n");
                 return -EINVAL;
         }
         if (lowest_speed > highest_speed) {
-                pr_info(PFX "nonsense! lowest (%d > %d) !\n",
+                pr_info("nonsense! lowest (%d > %d) !\n",
                         lowest_speed, highest_speed);
                 return -EINVAL;
         }
@@ -535,16 +535,16 @@ static void longhaul_setup_voltagescaling(void)
 
         rdmsrl(MSR_VIA_LONGHAUL, longhaul.val);
         if (!(longhaul.bits.RevisionID & 1)) {
-                pr_info(PFX "Voltage scaling not supported by CPU\n");
+                pr_info("Voltage scaling not supported by CPU\n");
                 return;
         }
 
         if (!longhaul.bits.VRMRev) {
-                pr_info(PFX "VRM 8.5\n");
+                pr_info("VRM 8.5\n");
                 vrm_mV_table = &vrm85_mV[0];
                 mV_vrm_table = &mV_vrm85[0];
         } else {
-                pr_info(PFX "Mobile VRM\n");
+                pr_info("Mobile VRM\n");
                 if (cpu_model < CPU_NEHEMIAH)
                         return;
                 vrm_mV_table = &mobilevrm_mV[0];
@@ -555,21 +555,21 @@ static void longhaul_setup_voltagescaling(void)
         maxvid = vrm_mV_table[longhaul.bits.MaximumVID];
 
         if (minvid.mV == 0 || maxvid.mV == 0 || minvid.mV > maxvid.mV) {
-                pr_info(PFX "Bogus values Min:%d.%03d Max:%d.%03d - Voltage scaling disabled\n",
+                pr_info("Bogus values Min:%d.%03d Max:%d.%03d - Voltage scaling disabled\n",
                         minvid.mV/1000, minvid.mV%1000,
                         maxvid.mV/1000, maxvid.mV%1000);
                 return;
         }
 
         if (minvid.mV == maxvid.mV) {
-                pr_info(PFX "Claims to support voltage scaling but min & max are both %d.%03d - Voltage scaling disabled\n",
+                pr_info("Claims to support voltage scaling but min & max are both %d.%03d - Voltage scaling disabled\n",
                         maxvid.mV/1000, maxvid.mV%1000);
                 return;
         }
 
         /* How many voltage steps*/
         numvscales = maxvid.pos - minvid.pos + 1;
-        pr_info(PFX "Max VID=%d.%03d  Min VID=%d.%03d, %d possible voltage scales\n",
+        pr_info("Max VID=%d.%03d  Min VID=%d.%03d, %d possible voltage scales\n",
                 maxvid.mV/1000, maxvid.mV%1000,
                 minvid.mV/1000, minvid.mV%1000,
                 numvscales);
@@ -608,12 +608,12 @@ static void longhaul_setup_voltagescaling(void)
                         pos = minvid.pos;
                 freq_pos->driver_data |= mV_vrm_table[pos] << 8;
                 vid = vrm_mV_table[mV_vrm_table[pos]];
-                pr_info(PFX "f: %d kHz, index: %d, vid: %d mV\n",
+                pr_info("f: %d kHz, index: %d, vid: %d mV\n",
                         speed, (int)(freq_pos - longhaul_table), vid.mV);
         }
 
         can_scale_voltage = 1;
-        pr_info(PFX "Voltage scaling enabled\n");
+        pr_info("Voltage scaling enabled\n");
 }
 
 
@@ -711,7 +711,7 @@ static int enable_arbiter_disable(void)
                         pci_write_config_byte(dev, reg, pci_cmd);
                         pci_read_config_byte(dev, reg, &pci_cmd);
                         if (!(pci_cmd & 1<<7)) {
-                                pr_err(PFX "Can't enable access to port 0x22\n");
+                                pr_err("Can't enable access to port 0x22\n");
                                 status = 0;
                         }
                 }
@@ -748,7 +748,7 @@ static int longhaul_setup_southbridge(void)
                 if (pci_cmd & 1 << 7) {
                         pci_read_config_dword(dev, 0x88, &acpi_regs_addr);
                         acpi_regs_addr &= 0xff00;
-                        pr_info(PFX "ACPI I/O at 0x%x\n", acpi_regs_addr);
+                        pr_info("ACPI I/O at 0x%x\n", acpi_regs_addr);
                 }
 
                 pci_dev_put(dev);
@@ -842,7 +842,7 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)
                         longhaul_version = TYPE_LONGHAUL_V1;
         }
 
-        pr_info(PFX "VIA %s CPU detected.  ", cpuname);
+        pr_info("VIA %s CPU detected.  ", cpuname);
         switch (longhaul_version) {
         case TYPE_LONGHAUL_V1:
         case TYPE_LONGHAUL_V2:
@@ -878,14 +878,14 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)
         if (!(longhaul_flags & USE_ACPI_C3
              || longhaul_flags & USE_NORTHBRIDGE)
             && ((pr == NULL) || !(pr->flags.bm_control))) {
-                pr_err(PFX "No ACPI support: Unsupported northbridge\n");
+                pr_err("No ACPI support: Unsupported northbridge\n");
                 return -ENODEV;
         }
 
         if (longhaul_flags & USE_NORTHBRIDGE)
-                pr_info(PFX "Using northbridge support\n");
+                pr_info("Using northbridge support\n");
         if (longhaul_flags & USE_ACPI_C3)
-                pr_info(PFX "Using ACPI support\n");
+                pr_info("Using ACPI support\n");
 
         ret = longhaul_get_ranges();
         if (ret != 0)
@@ -922,18 +922,18 @@ static int __init longhaul_init(void)
                 return -ENODEV;
 
         if (!enable) {
-                pr_err(PFX "Option \"enable\" not set - Aborting\n");
+                pr_err("Option \"enable\" not set - Aborting\n");
                 return -ENODEV;
         }
 #ifdef CONFIG_SMP
         if (num_online_cpus() > 1) {
-                pr_err(PFX "More than 1 CPU detected, longhaul disabled\n");
+                pr_err("More than 1 CPU detected, longhaul disabled\n");
                 return -ENODEV;
         }
 #endif
 #ifdef CONFIG_X86_IO_APIC
         if (cpu_has_apic) {
-                pr_err(PFX "APIC detected. Longhaul is currently broken in this configuration.\n");
+                pr_err("APIC detected. Longhaul is currently broken in this configuration.\n");
                 return -ENODEV;
         }
 #endif
@@ -941,7 +941,7 @@ static int __init longhaul_init(void)
         case 6 ... 9:
                 return cpufreq_register_driver(&longhaul_driver);
         case 10:
-                pr_err(PFX "Use acpi-cpufreq driver for VIA C7\n");
+                pr_err("Use acpi-cpufreq driver for VIA C7\n");
         default:
                 ;
         }
diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index 93c7928cf461..6bbdac1065ff 100644
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -10,6 +10,9 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/cpufreq.h>
 #include <linux/module.h>
 #include <linux/err.h>
@@ -76,7 +79,7 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
 
         cpuclk = clk_get(NULL, "cpu_clk");
         if (IS_ERR(cpuclk)) {
-                pr_err("cpufreq: couldn't get CPU clk\n");
+                pr_err("couldn't get CPU clk\n");
                 return PTR_ERR(cpuclk);
         }
 
@@ -163,7 +166,7 @@ static int __init cpufreq_init(void)
         if (ret)
                 return ret;
 
-        pr_info("cpufreq: Loongson-2F CPU frequency driver.\n");
+        pr_info("Loongson-2F CPU frequency driver\n");
 
         cpufreq_register_notifier(&loongson2_cpufreq_notifier_block,
                                   CPUFREQ_TRANSITION_NOTIFIER);
diff --git a/drivers/cpufreq/maple-cpufreq.c b/drivers/cpufreq/maple-cpufreq.c
index 7e55632291d7..d9df89392b84 100644
--- a/drivers/cpufreq/maple-cpufreq.c
+++ b/drivers/cpufreq/maple-cpufreq.c
@@ -13,6 +13,8 @@
 
 #undef DEBUG
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -174,7 +176,7 @@ static int __init maple_cpufreq_init(void)
         /* Get first CPU node */
         cpunode = of_cpu_device_node_get(0);
         if (cpunode == NULL) {
-                pr_err("cpufreq: Can't find any CPU 0 node\n");
+                pr_err("Can't find any CPU 0 node\n");
                 goto bail_noprops;
         }
 
@@ -182,7 +184,7 @@ static int __init maple_cpufreq_init(void)
         /* we actually don't care on which CPU to access PVR */
         pvr_hi = PVR_VER(mfspr(SPRN_PVR));
         if (pvr_hi != 0x3c && pvr_hi != 0x44) {
-                pr_err("cpufreq: Unsupported CPU version (%x)\n", pvr_hi);
+                pr_err("Unsupported CPU version (%x)\n", pvr_hi);
                 goto bail_noprops;
         }
 
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 655fc9427626..cead9bec4843 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -13,6 +13,9 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -163,7 +166,7 @@ static int omap_cpufreq_probe(struct platform_device *pdev)
 {
         mpu_dev = get_cpu_device(0);
         if (!mpu_dev) {
-                pr_warn("%s: unable to get the mpu device\n", __func__);
+                pr_warn("%s: unable to get the MPU device\n", __func__);
                 return -EINVAL;
         }
 
diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
index 4d1a44370338..fd77812313f3 100644
--- a/drivers/cpufreq/p4-clockmod.c
+++ b/drivers/cpufreq/p4-clockmod.c
@@ -20,6 +20,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -35,8 +37,6 @@
 
 #include "speedstep-lib.h"
 
-#define PFX     "p4-clockmod: "
-
 /*
  * Duty Cycle (3bits), note DC_DISABLE is not specified in
  * intel docs i just use it to mean disable
@@ -124,7 +124,7 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
 {
         if (c->x86 == 0x06) {
                 if (cpu_has(c, X86_FEATURE_EST))
-                        pr_warn_once(PFX "Warning: EST-capable CPU detected. The acpi-cpufreq module offers voltage scaling in addition to frequency scaling. You should use that instead of p4-clockmod, if possible.\n");
+                        pr_warn_once("Warning: EST-capable CPU detected. The acpi-cpufreq module offers voltage scaling in addition to frequency scaling. You should use that instead of p4-clockmod, if possible.\n");
                 switch (c->x86_model) {
                 case 0x0E: /* Core */
                 case 0x0F: /* Core Duo */
@@ -148,7 +148,7 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
         p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
 
         if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
-                pr_warn(PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq modules offer voltage scaling in addition of frequency scaling. You should use either one instead of p4-clockmod, if possible.\n");
+                pr_warn("Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq modules offer voltage scaling in addition of frequency scaling. You should use either one instead of p4-clockmod, if possible.\n");
                 return speedstep_get_frequency(SPEEDSTEP_CPU_P4M);
         }
 
@@ -257,7 +257,7 @@ static int __init cpufreq_p4_init(void)
 
         ret = cpufreq_register_driver(&p4clockmod_driver);
         if (!ret)
-                pr_info(PFX "P4/Xeon(TM) CPU On-Demand Clock Modulation available\n");
+                pr_info("P4/Xeon(TM) CPU On-Demand Clock Modulation available\n");
 
         return ret;
 }
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
index 072d7b3841b9..b7b576e53e92 100644
--- a/drivers/cpufreq/pmac32-cpufreq.c
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -481,13 +483,13 @@ static int pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
                 freqs = of_get_property(cpunode, "bus-frequencies", &lenp);
                 lenp /= sizeof(u32);
                 if (freqs == NULL || lenp != 2) {
-                        pr_err("cpufreq: bus-frequencies incorrect or missing\n");
+                        pr_err("bus-frequencies incorrect or missing\n");
                         return 1;
                 }
                 ratio = of_get_property(cpunode, "processor-to-bus-ratio*2",
                                                 NULL);
                 if (ratio == NULL) {
-                        pr_err("cpufreq: processor-to-bus-ratio*2 missing\n");
+                        pr_err("processor-to-bus-ratio*2 missing\n");
                         return 1;
                 }
 
@@ -550,7 +552,7 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode)
         if (volt_gpio_np)
                 voltage_gpio = read_gpio(volt_gpio_np);
         if (!voltage_gpio){
-                pr_err("cpufreq: missing cpu-vcore-select gpio\n");
+                pr_err("missing cpu-vcore-select gpio\n");
                 return 1;
         }
 
diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 5ffe0855ba8f..267e0894c62d 100644
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -12,6 +12,8 @@
 
 #undef DEBUG
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -138,7 +140,7 @@ static void g5_vdnap_switch_volt(int speed_mode)
                 usleep_range(1000, 1000);
         }
         if (done == 0)
-                pr_warn("cpufreq: Timeout in clock slewing !\n");
+                pr_warn("Timeout in clock slewing !\n");
 }
 
 
@@ -266,7 +268,7 @@ static int g5_pfunc_switch_freq(int speed_mode)
                 rc = pmf_call_one(pfunc_cpu_setfreq_low, NULL);
 
         if (rc)
-                pr_warn("cpufreq: pfunc switch error %d\n", rc);
+                pr_warn("pfunc switch error %d\n", rc);
 
         /* It's an irq GPIO so we should be able to just block here,
          * I'll do that later after I've properly tested the IRQ code for
@@ -282,7 +284,7 @@ static int g5_pfunc_switch_freq(int speed_mode)
                 usleep_range(500, 500);
         }
         if (done == 0)
-                pr_warn("cpufreq: Timeout in clock slewing !\n");
+                pr_warn("Timeout in clock slewing !\n");
 
         /* If frequency is going down, last ramp the voltage */
         if (speed_mode > g5_pmode_cur)
@@ -368,7 +370,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
         }
         pvr_hi = (*valp) >> 16;
         if (pvr_hi != 0x3c && pvr_hi != 0x44) {
-                pr_err("cpufreq: Unsupported CPU version\n");
+                pr_err("Unsupported CPU version\n");
                 goto bail_noprops;
         }
 
@@ -403,7 +405,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
 
                 root = of_find_node_by_path("/");
                 if (root == NULL) {
-                        pr_err("cpufreq: Can't find root of device tree\n");
+                        pr_err("Can't find root of device tree\n");
                         goto bail_noprops;
                 }
                 pfunc_set_vdnap0 = pmf_find_function(root, "set-vdnap0");
@@ -411,7 +413,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpunode)
                         pmf_find_function(root, "slewing-done");
                 if (pfunc_set_vdnap0 == NULL ||
                     pfunc_vdnap0_complete == NULL) {
-                        pr_err("cpufreq: Can't find required platform function\n");
+                        pr_err("Can't find required platform function\n");
                         goto bail_noprops;
                 }
 
@@ -491,7 +493,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         if (cpuid != NULL)
                 eeprom = of_get_property(cpuid, "cpuid", NULL);
         if (eeprom == NULL) {
-                pr_err("cpufreq: Can't find cpuid EEPROM !\n");
+                pr_err("Can't find cpuid EEPROM !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -509,7 +511,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
                 break;
         }
         if (hwclock == NULL) {
-                pr_err("cpufreq: Can't find i2c clock chip !\n");
+                pr_err("Can't find i2c clock chip !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -537,7 +539,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         /* Check we have minimum requirements */
         if (pfunc_cpu_getfreq == NULL || pfunc_cpu_setfreq_high == NULL ||
             pfunc_cpu_setfreq_low == NULL || pfunc_slewing_done == NULL) {
-                pr_err("cpufreq: Can't find platform functions !\n");
+                pr_err("Can't find platform functions !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -565,7 +567,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
         /* Get max frequency from device-tree */
         valp = of_get_property(cpunode, "clock-frequency", NULL);
         if (!valp) {
-                pr_err("cpufreq: Can't find CPU frequency !\n");
+                pr_err("Can't find CPU frequency !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -581,7 +583,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
 
         /* Check for machines with no useful settings */
         if (il == ih) {
-                pr_warn("cpufreq: No low frequency mode available on this model !\n");
+                pr_warn("No low frequency mode available on this model !\n");
                 rc = -ENODEV;
                 goto bail;
         }
@@ -592,7 +594,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpunode)
 
         /* Sanity check */
         if (min_freq >= max_freq || min_freq < 1000) {
-                pr_err("cpufreq: Can't calculate low frequency !\n");
+                pr_err("Can't calculate low frequency !\n");
                 rc = -ENXIO;
                 goto bail;
         }
@@ -651,7 +653,7 @@ static int __init g5_cpufreq_init(void)
         /* Get first CPU node */
         cpunode = of_cpu_device_node_get(0);
         if (cpunode == NULL) {
-                pr_err("cpufreq: Can't find any CPU node\n");
+                pr_err("Can't find any CPU node\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/cpufreq/powernow-k6.c b/drivers/cpufreq/powernow-k6.c
index 981f40b1caf4..dedd2568e852 100644
--- a/drivers/cpufreq/powernow-k6.c
+++ b/drivers/cpufreq/powernow-k6.c
@@ -8,6 +8,8 @@
  *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -22,7 +24,6 @@
 #define POWERNOW_IOPORT 0xfff0          /* it doesn't matter where, as long
                                            as it is unused */
 
-#define PFX "powernow-k6: "
 static unsigned int                     busfreq;   /* FSB, in 10 kHz */
 static unsigned int                     max_multiplier;
 
@@ -141,7 +142,7 @@ static int powernow_k6_target(struct cpufreq_policy *policy,
 {
 
         if (clock_ratio[best_i].driver_data > max_multiplier) {
-                pr_err(PFX "invalid target frequency\n");
+                pr_err("invalid target frequency\n");
                 return -EINVAL;
         }
 
@@ -175,14 +176,14 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
                                 max_multiplier = param_max_multiplier;
                                 goto have_max_multiplier;
                         }
-                pr_err("powernow-k6: invalid max_multiplier parameter, valid parameters 20, 30, 35, 40, 45, 50, 55, 60\n");
+                pr_err("invalid max_multiplier parameter, valid parameters 20, 30, 35, 40, 45, 50, 55, 60\n");
                 return -EINVAL;
         }
 
         if (!max_multiplier) {
-                pr_warn("powernow-k6: unknown frequency %u, cannot determine current multiplier\n",
+                pr_warn("unknown frequency %u, cannot determine current multiplier\n",
                         khz);
-                pr_warn("powernow-k6: use module parameters max_multiplier and bus_frequency\n");
+                pr_warn("use module parameters max_multiplier and bus_frequency\n");
                 return -EOPNOTSUPP;
         }
 
@@ -194,7 +195,7 @@ have_max_multiplier:
                         busfreq = param_busfreq / 10;
                         goto have_busfreq;
                 }
-                pr_err("powernow-k6: invalid bus_frequency parameter, allowed range 50000 - 150000 kHz\n");
+                pr_err("invalid bus_frequency parameter, allowed range 50000 - 150000 kHz\n");
                 return -EINVAL;
         }
 
@@ -276,7 +277,7 @@ static int __init powernow_k6_init(void)
                 return -ENODEV;
 
         if (!request_region(POWERNOW_IOPORT, 16, "PowerNow!")) {
-                pr_info(PFX "PowerNow IOPORT region already used\n");
+                pr_info("PowerNow IOPORT region already used\n");
                 return -EIO;
         }
 
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 4a1b420da72e..9f013ed42977 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -13,6 +13,8 @@
  *  - We disable half multipliers if ACPI is used on A0 stepping CPUs.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -35,9 +37,6 @@
 
 #include "powernow-k7.h"
 
-#define PFX "powernow: "
-
-
 struct psb_s {
         u8 signature[10];
         u8 tableversion;
@@ -127,13 +126,13 @@ static int check_powernow(void)
         maxei = cpuid_eax(0x80000000);
         if (maxei < 0x80000007) {       /* Any powernow info ? */
 #ifdef MODULE
-                pr_info(PFX "No powernow capabilities detected\n");
+                pr_info("No powernow capabilities detected\n");
 #endif
                 return 0;
         }
 
         if ((c->x86_model == 6) && (c->x86_mask == 0)) {
-                pr_info(PFX "K7 660[A0] core detected, enabling errata workarounds\n");
+                pr_info("K7 660[A0] core detected, enabling errata workarounds\n");
                 have_a0 = 1;
         }
 
@@ -143,7 +142,7 @@ static int check_powernow(void)
         if (!(edx & (1 << 1 | 1 << 2)))
                 return 0;
 
-        pr_info(PFX "PowerNOW! Technology present. Can scale: ");
+        pr_info("PowerNOW! Technology present. Can scale: ");
 
         if (edx & 1 << 1) {
                 pr_cont("frequency");
@@ -426,14 +425,14 @@ err1:
 err05:
         kfree(acpi_processor_perf);
 err0:
-        pr_warn(PFX "ACPI perflib can not be used on this platform\n");
+        pr_warn("ACPI perflib can not be used on this platform\n");
         acpi_processor_perf = NULL;
         return retval;
 }
 #else
 static int powernow_acpi_init(void)
 {
-        pr_info(PFX "no support for ACPI processor found - please recompile your kernel with ACPI processor\n");
+        pr_info("no support for ACPI processor found - please recompile your kernel with ACPI processor\n");
         return -EINVAL;
 }
 #endif
@@ -465,7 +464,7 @@ static int powernow_decode_bios(int maxfid, int startvid)
                         psb = (struct psb_s *) p;
                         pr_debug("Table version: 0x%x\n", psb->tableversion);
                         if (psb->tableversion != 0x12) {
-                                pr_info(PFX "Sorry, only v1.2 tables supported right now\n");
+                                pr_info("Sorry, only v1.2 tables supported right now\n");
                                 return -ENODEV;
                         }
 
@@ -477,7 +476,7 @@ static int powernow_decode_bios(int maxfid, int startvid)
 
                         latency = psb->settlingtime;
                         if (latency < 100) {
-                                pr_info(PFX "BIOS set settling time to %d microseconds. Should be at least 100. Correcting.\n",
+                                pr_info("BIOS set settling time to %d microseconds. Should be at least 100. Correcting.\n",
                                         latency);
                                 latency = 100;
                         }
@@ -510,9 +509,9 @@ static int powernow_decode_bios(int maxfid, int startvid)
                                                 p += 2;
                                 }
                         }
-                        pr_info(PFX "No PST tables match this cpuid (0x%x)\n",
+                        pr_info("No PST tables match this cpuid (0x%x)\n",
                                 etuple);
-                        pr_info(PFX "This is indicative of a broken BIOS\n");
+                        pr_info("This is indicative of a broken BIOS\n");
 
                         return -EINVAL;
                 }
@@ -545,7 +544,7 @@ static int fixup_sgtc(void)
         sgtc = 100 * m * latency;
         sgtc = sgtc / 3;
         if (sgtc > 0xfffff) {
-                pr_warn(PFX "SGTC too large %d\n", sgtc);
+                pr_warn("SGTC too large %d\n", sgtc);
                 sgtc = 0xfffff;
         }
         return sgtc;
@@ -567,10 +566,10 @@ static unsigned int powernow_get(unsigned int cpu)
 
 static int acer_cpufreq_pst(const struct dmi_system_id *d)
 {
-        pr_warn(PFX "%s laptop with broken PST tables in BIOS detected\n",
+        pr_warn("%s laptop with broken PST tables in BIOS detected\n",
                 d->ident);
-        pr_warn(PFX "You need to downgrade to 3A21 (09/09/2002), or try a newer BIOS than 3A71 (01/20/2003)\n");
-        pr_warn(PFX "cpufreq scaling has been disabled as a result of this\n");
+        pr_warn("You need to downgrade to 3A21 (09/09/2002), or try a newer BIOS than 3A71 (01/20/2003)\n");
+        pr_warn("cpufreq scaling has been disabled as a result of this\n");
         return 0;
 }
 
@@ -605,37 +604,37 @@ static int powernow_cpu_init(struct cpufreq_policy *policy)
 
         fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];
         if (!fsb) {
-                pr_warn(PFX "can not determine bus frequency\n");
+                pr_warn("can not determine bus frequency\n");
                 return -EINVAL;
         }
         pr_debug("FSB: %3dMHz\n", fsb/1000);
 
         if (dmi_check_system(powernow_dmi_table) || acpi_force) {
-                pr_info(PFX "PSB/PST known to be broken - trying ACPI instead\n");
+                pr_info("PSB/PST known to be broken - trying ACPI instead\n");
                 result = powernow_acpi_init();
         } else {
                 result = powernow_decode_bios(fidvidstatus.bits.MFID,
                                 fidvidstatus.bits.SVID);
                 if (result) {
-                        pr_info(PFX "Trying ACPI perflib\n");
+                        pr_info("Trying ACPI perflib\n");
                         maximum_speed = 0;
                         minimum_speed = -1;
                         latency = 0;
                         result = powernow_acpi_init();
                         if (result) {
-                                pr_info(PFX "ACPI and legacy methods failed\n");
+                                pr_info("ACPI and legacy methods failed\n");
                         }
                 } else {
                         /* SGTC use the bus clock as timer */
                         latency = fixup_sgtc();
-                        pr_info(PFX "SGTC: %d\n", latency);
+                        pr_info("SGTC: %d\n", latency);
                 }
         }
 
         if (result)
                 return result;
 
-        pr_info(PFX "Minimum speed %d MHz - Maximum speed %d MHz\n",
+        pr_info("Minimum speed %d MHz - Maximum speed %d MHz\n",
                 minimum_speed/1000, maximum_speed/1000);
 
         policy->cpuinfo.transition_latency =
diff --git a/drivers/cpufreq/pxa2xx-cpufreq.c b/drivers/cpufreq/pxa2xx-cpufreq.c
index 8a27667c16fa..ce345bf34d5d 100644
--- a/drivers/cpufreq/pxa2xx-cpufreq.c
+++ b/drivers/cpufreq/pxa2xx-cpufreq.c
@@ -29,6 +29,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -186,8 +188,7 @@ static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq)
 
         ret = regulator_set_voltage(vcc_core, vmin, vmax);
         if (ret)
-                pr_err("cpufreq: Failed to set vcc_core in [%dmV..%dmV]\n",
-                       vmin, vmax);
+                pr_err("Failed to set vcc_core in [%dmV..%dmV]\n", vmin, vmax);
         return ret;
 }
 
@@ -195,10 +196,10 @@ static void __init pxa_cpufreq_init_voltages(void)
 {
         vcc_core = regulator_get(NULL, "vcc_core");
         if (IS_ERR(vcc_core)) {
-                pr_info("cpufreq: Didn't find vcc_core regulator\n");
+                pr_info("Didn't find vcc_core regulator\n");
                 vcc_core = NULL;
         } else {
-                pr_info("cpufreq: Found vcc_core regulator\n");
+                pr_info("Found vcc_core regulator\n");
         }
 }
 #else
@@ -407,7 +408,7 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)
          */
         if (cpu_is_pxa25x()) {
                 find_freq_tables(&pxa255_freq_table, &pxa255_freqs);
-                pr_info("PXA255 cpufreq using %s frequency table\n",
+                pr_info("using %s frequency table\n",
                         pxa255_turbo_table ? "turbo" : "run");
 
                 cpufreq_table_validate_and_show(policy, pxa255_freq_table);
@@ -416,7 +417,7 @@ static int pxa_cpufreq_init(struct cpufreq_policy *policy)
                 cpufreq_table_validate_and_show(policy, pxa27x_freq_table);
         }
 
-        pr_info("PXA CPU frequency change support initialized\n");
+        pr_info("frequency change support initialized\n");
 
         return 0;
 }
diff --git a/drivers/cpufreq/s3c2412-cpufreq.c b/drivers/cpufreq/s3c2412-cpufreq.c
index f9447bac9e22..b04b6f02bbdc 100644
--- a/drivers/cpufreq/s3c2412-cpufreq.c
+++ b/drivers/cpufreq/s3c2412-cpufreq.c
@@ -10,6 +10,8 @@
  * published by the Free Software Foundation.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
@@ -197,20 +199,20 @@ static int s3c2412_cpufreq_add(struct device *dev,
 
         hclk = clk_get(NULL, "hclk");
         if (IS_ERR(hclk)) {
-                pr_err("%s: cannot find hclk clock\n", __func__);
+                pr_err("cannot find hclk clock\n");
                 return -ENOENT;
         }
 
         fclk = clk_get(NULL, "fclk");
         if (IS_ERR(fclk)) {
-                pr_err("%s: cannot find fclk clock\n", __func__);
+                pr_err("cannot find fclk clock\n");
                 goto err_fclk;
         }
 
         fclk_rate = clk_get_rate(fclk);
         if (fclk_rate > 200000000) {
-                pr_info("%s: fclk %ld MHz, assuming 266MHz capable part\n",
-                        __func__, fclk_rate / 1000000);
+                pr_info("fclk %ld MHz, assuming 266MHz capable part\n",
+                        fclk_rate / 1000000);
                 s3c2412_cpufreq_info.max.fclk = 266000000;
                 s3c2412_cpufreq_info.max.hclk = 133000000;
                 s3c2412_cpufreq_info.max.pclk =  66000000;
@@ -218,13 +220,13 @@ static int s3c2412_cpufreq_add(struct device *dev,
 
         armclk = clk_get(NULL, "armclk");
         if (IS_ERR(armclk)) {
-                pr_err("%s: cannot find arm clock\n", __func__);
+                pr_err("cannot find arm clock\n");
                 goto err_armclk;
         }
 
         xtal = clk_get(NULL, "xtal");
         if (IS_ERR(xtal)) {
-                pr_err("%s: cannot find xtal clock\n", __func__);
+                pr_err("cannot find xtal clock\n");
                 goto err_xtal;
         }
 
diff --git a/drivers/cpufreq/s3c2440-cpufreq.c b/drivers/cpufreq/s3c2440-cpufreq.c
index f6cefe34e411..d0d75b65ddd6 100644
--- a/drivers/cpufreq/s3c2440-cpufreq.c
+++ b/drivers/cpufreq/s3c2440-cpufreq.c
@@ -11,6 +11,8 @@
  * published by the Free Software Foundation.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
diff --git a/drivers/cpufreq/s3c24xx-cpufreq-debugfs.c b/drivers/cpufreq/s3c24xx-cpufreq-debugfs.c
index 8182608aeac1..4d976e8dbb2f 100644
--- a/drivers/cpufreq/s3c24xx-cpufreq-debugfs.c
+++ b/drivers/cpufreq/s3c24xx-cpufreq-debugfs.c
@@ -10,6 +10,8 @@
  * published by the Free Software Foundation.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/export.h>
 #include <linux/interrupt.h>
diff --git a/drivers/cpufreq/s3c24xx-cpufreq.c b/drivers/cpufreq/s3c24xx-cpufreq.c
index 68f883744500..ae8eaed77b70 100644
--- a/drivers/cpufreq/s3c24xx-cpufreq.c
+++ b/drivers/cpufreq/s3c24xx-cpufreq.c
@@ -10,6 +10,8 @@
  * published by the Free Software Foundation.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
@@ -356,7 +358,7 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name)
 
         clk = clk_get(dev, name);
         if (IS_ERR(clk))
-                pr_err("cpufreq: failed to get clock '%s'\n", name);
+                pr_err("failed to get clock '%s'\n", name);
 
         return clk;
 }
@@ -665,9 +667,9 @@ int s3c_plltab_register(struct cpufreq_frequency_table *plls,
                 vals += plls_no;
                 vals->frequency = CPUFREQ_TABLE_END;
 
-                pr_info("cpufreq: %d PLL entries\n", plls_no);
+                pr_info("%d PLL entries\n", plls_no);
         } else
-                pr_err("cpufreq: no memory for PLL tables\n");
+                pr_err("no memory for PLL tables\n");
 
         return vals ? 0 : -ENOMEM;
 }
diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index 344e584412ed..06d85917b6d5 100644
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -9,6 +9,8 @@
  * published by the Free Software Foundation.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -635,13 +637,13 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev)
 
         arm_regulator = regulator_get(NULL, "vddarm");
         if (IS_ERR(arm_regulator)) {
-                pr_err("failed to get regulator vddarm");
+                pr_err("failed to get regulator vddarm\n");
                 return PTR_ERR(arm_regulator);
         }
 
         int_regulator = regulator_get(NULL, "vddint");
         if (IS_ERR(int_regulator)) {
-                pr_err("failed to get regulator vddint");
+                pr_err("failed to get regulator vddint\n");
                 regulator_put(arm_regulator);
                 return PTR_ERR(int_regulator);
         }
diff --git a/drivers/cpufreq/sc520_freq.c b/drivers/cpufreq/sc520_freq.c
index 57bbddf55786..4225501a4b78 100644
--- a/drivers/cpufreq/sc520_freq.c
+++ b/drivers/cpufreq/sc520_freq.c
@@ -13,6 +13,8 @@
  *      2005-03-30: - initial revision
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -30,8 +32,6 @@
 
 static __u8 __iomem *cpuctl;
 
-#define PFX "sc520_freq: "
-
 static struct cpufreq_frequency_table sc520_freq_table[] = {
         {0, 0x01,       100000},
         {0, 0x02,       133000},
@@ -44,7 +44,7 @@ static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu)
 
         switch (clockspeed_reg & 0x03) {
         default:
-                pr_err(PFX "error: cpuctl register has unexpected value %02x\n",
+                pr_err("error: cpuctl register has unexpected value %02x\n",
                        clockspeed_reg);
         case 0x01:
                 return 100000;
diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
index 47df2d649b78..41bc5397f4bb 100644
--- a/drivers/cpufreq/speedstep-centrino.c
+++ b/drivers/cpufreq/speedstep-centrino.c
@@ -13,6 +13,8 @@
  * Copyright (C) 2003 Jeremy Fitzhardinge <jeremy@goop.org>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -27,7 +29,6 @@
 #include <asm/cpufeature.h>
 #include <asm/cpu_device_id.h>
 
-#define PFX             "speedstep-centrino: "
 #define MAINTAINER      "linux-pm@vger.kernel.org"
 
 #define INTEL_MSR_RANGE (0xffff)
@@ -386,7 +387,7 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
                 /* check to see if it stuck */
                 rdmsr(MSR_IA32_MISC_ENABLE, l, h);
                 if (!(l & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
-                        pr_info(PFX "couldn't enable Enhanced SpeedStep\n");
+                        pr_info("couldn't enable Enhanced SpeedStep\n");
                         return -ENODEV;
                 }
         }
diff --git a/drivers/cpufreq/speedstep-ich.c b/drivers/cpufreq/speedstep-ich.c
index 9d00c226a6aa..b86953a3ddc4 100644
--- a/drivers/cpufreq/speedstep-ich.c
+++ b/drivers/cpufreq/speedstep-ich.c
@@ -18,6 +18,8 @@
  *                        SPEEDSTEP - DEFINITIONS                    *
  *********************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -68,13 +70,13 @@ static int speedstep_find_register(void)
         /* get PMBASE */
         pci_read_config_dword(speedstep_chipset_dev, 0x40, &pmbase);
         if (!(pmbase & 0x01)) {
-                pr_err("speedstep-ich: could not find speedstep register\n");
+                pr_err("could not find speedstep register\n");
                 return -ENODEV;
         }
 
         pmbase &= 0xFFFFFFFE;
         if (!pmbase) {
-                pr_err("speedstep-ich: could not find speedstep register\n");
+                pr_err("could not find speedstep register\n");
                 return -ENODEV;
         }
 
@@ -136,7 +138,7 @@ static void speedstep_set_state(unsigned int state)
                 pr_debug("change to %u MHz succeeded\n",
                         speedstep_get_frequency(speedstep_processor) / 1000);
         else
-                pr_err("cpufreq: change failed - I/O error\n");
+                pr_err("change failed - I/O error\n");
 
         return;
 }
diff --git a/drivers/cpufreq/speedstep-lib.c b/drivers/cpufreq/speedstep-lib.c
index 32bdf1df9517..1b8062182c81 100644
--- a/drivers/cpufreq/speedstep-lib.c
+++ b/drivers/cpufreq/speedstep-lib.c
@@ -8,6 +8,8 @@
  *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -453,7 +455,7 @@ unsigned int speedstep_get_freqs(enum speedstep_processor processor,
                  */
                 if (*transition_latency > 10000000 ||
                     *transition_latency < 50000) {
-                        pr_warn(PFX "frequency transition measured seems out of range (%u nSec), falling back to a safe one of %u nSec\n",
+                        pr_warn("frequency transition measured seems out of range (%u nSec), falling back to a safe one of %u nSec\n",
                                 *transition_latency, 500000);
                         *transition_latency = 500000;
                 }
diff --git a/drivers/cpufreq/speedstep-smi.c b/drivers/cpufreq/speedstep-smi.c
index af32a5f38806..770a9ae1999a 100644
--- a/drivers/cpufreq/speedstep-smi.c
+++ b/drivers/cpufreq/speedstep-smi.c
@@ -12,6 +12,8 @@
  *                        SPEEDSTEP - DEFINITIONS                    *
  *********************************************************************/
 
+#define pr_fmt(fmt) "cpufreq: " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -204,7 +206,7 @@ static void speedstep_set_state(unsigned int state)
                         (speedstep_freqs[new_state].frequency / 1000),
                         retry, result);
         else
-                pr_err("cpufreq: change to state %u failed with new_state %u and result %u\n",
+                pr_err("change to state %u failed with new_state %u and result %u\n",
                        state, new_state, result);
 
         return;