[PATCH 07/32] drivers/hwmon/coretemp.c: Use pr_fmt and pr_<level>

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Joe Perches
Date: Tuesday, October 19, 2010 - 11:51 pm

Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/hwmon/coretemp.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 42de98d..194ca0a 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.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>
@@ -445,8 +447,8 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
 	 * without thermal sensors will be filtered out.
 	 */
 	if (!cpu_has(c, X86_FEATURE_DTS)) {
-		printk(KERN_INFO DRVNAME ": CPU (model=0x%x)"
-		       " has no thermal sensor.\n", c->x86_model);
+		pr_info("CPU (model=0x%x) has no thermal sensor\n",
+			c->x86_model);
 		return 0;
 	}
 
@@ -466,7 +468,7 @@ static int __cpuinit coretemp_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;
 	}
 
@@ -478,8 +480,7 @@ static int __cpuinit coretemp_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;
 	}
 
-- 
1.7.3.1.g432b3.dirty

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] drivers/hwmon: Use pr_fmt and pr_&lt;level&gt;, Joe Perches, (Tue Oct 19, 4:13 pm)
Re: [PATCH] drivers/hwmon: Use pr_fmt and pr_&lt;level&gt;, Henrik Rydberg, (Tue Oct 19, 11:04 pm)
[PATCH 07/32] drivers/hwmon/coretemp.c: Use pr_fmt and pr_ ..., Joe Perches, (Tue Oct 19, 11:51 pm)
Re: [PATCH] drivers/hwmon: Use pr_fmt and pr_&lt;level&gt;, Guenter Roeck, (Wed Oct 20, 10:18 am)
Re: [PATCH] drivers/hwmon: Use pr_fmt and pr_&lt;level&gt;, Guenter Roeck, (Wed Oct 20, 10:48 am)
Re: [PATCH] drivers/hwmon: Use pr_fmt and pr_&lt;level&gt;, Guenter Roeck, (Wed Oct 20, 11:03 am)
Re: [PATCH] drivers/hwmon: Use pr_fmt and pr_&lt;level&gt;, Guenter Roeck, (Wed Oct 20, 11:35 am)
Re: [PATCH] drivers/hwmon: Use pr_fmt and pr_&lt;level&gt;, Davidlohr Bueso, (Wed Oct 20, 12:19 pm)