Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / hwmon / hwmon-vid.c

diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index 2b2ca1694f95e5e466e6211ef5f3230f2fc0fc02..2582bfef6ccb8a1accc4bad5a660dd621eba7fdb 100644 (file)
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -22,6 +22,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/hwmon-vid.h>
@@ -146,8 +148,8 @@ int vid_from_reg(int val, u8 vrm)
                return(val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000);
        default:                /* report 0 for unknown */
                if (vrm)
-                       printk(KERN_WARNING "hwmon-vid: Requested unsupported "
-                              "VRM version (%u)\n", (unsigned int)vrm);
+                       pr_warn("Requested unsupported VRM version (%u)\n",
+                               (unsigned int)vrm);
                return 0;
        }
 }
@@ -246,8 +248,7 @@ u8 vid_which_vrm(void)
        }
        vrm_ret = find_vrm(eff_family, eff_model, eff_stepping, c->x86_vendor);
        if (vrm_ret == 0)
-               printk(KERN_INFO "hwmon-vid: Unknown VRM version of your "
-                      "x86 CPU\n");
+               pr_info("Unknown VRM version of your x86 CPU\n");
        return vrm_ret;
 }
 
@@ -255,7 +256,7 @@ u8 vid_which_vrm(void)
 #else
 u8 vid_which_vrm(void)
 {
-       printk(KERN_INFO "hwmon-vid: Unknown VRM version of your CPU\n");
+       pr_info("Unknown VRM version of your CPU\n");
        return 0;
 }
 #endif