From 5833d2ec74fba7a8056d433f13b358a100d03a1e Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 20 Oct 2010 06:51:46 +0000
Subject: [PATCH] --- yaml --- r: 227752 b: refs/heads/master c:
 14a613cc23869d0ca69154bbc5816004fe201b17 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/hwmon/pkgtemp.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 26e1a6932512..729cf1a30667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2caec1343e0cfe59bacf3d4f67d69ab6283cc75b
+refs/heads/master: 14a613cc23869d0ca69154bbc5816004fe201b17
diff --git a/trunk/drivers/hwmon/pkgtemp.c b/trunk/drivers/hwmon/pkgtemp.c
index 0798210590bc..21c817d98123 100644
--- a/trunk/drivers/hwmon/pkgtemp.c
+++ b/trunk/drivers/hwmon/pkgtemp.c
@@ -20,6 +20,8 @@
  * 02110-1301 USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -303,7 +305,7 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu)
 	pdev = platform_device_alloc(DRVNAME, cpu);
 	if (!pdev) {
 		err = -ENOMEM;
-		printk(KERN_ERR DRVNAME ": Device allocation failed\n");
+		pr_err("Device allocation failed\n");
 		goto exit;
 	}
 
@@ -315,8 +317,7 @@ static int __cpuinit pkgtemp_device_add(unsigned int cpu)
 
 	err = platform_device_add(pdev);
 	if (err) {
-		printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
-		       err);
+		pr_err("Device addition failed (%d)\n", err);
 		goto exit_device_free;
 	}