diff options
author | Joe Perches <joe@perches.com> | 2010-10-20 02:51:50 -0400 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-01-08 13:55:28 -0500 |
commit | edb8d53c684da4062ac8c461727ddc1839336aa5 (patch) | |
tree | 849a30c7f379e522dc465942bffbad5ef920b11b /drivers/hwmon/via-cputemp.c | |
parent | 512504e9f5489dbe85c80fd2c1b44ab5a8e0d5fa (diff) |
hwmon: (via-cputemp) Use pr_fmt and pr_<level>
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>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon/via-cputemp.c')
-rw-r--r-- | drivers/hwmon/via-cputemp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c index ec7fad747adc..45b08c78b531 100644 --- a/drivers/hwmon/via-cputemp.c +++ b/drivers/hwmon/via-cputemp.c | |||
@@ -21,6 +21,8 @@ | |||
21 | * 02110-1301 USA. | 21 | * 02110-1301 USA. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
25 | |||
24 | #include <linux/module.h> | 26 | #include <linux/module.h> |
25 | #include <linux/init.h> | 27 | #include <linux/init.h> |
26 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
@@ -202,7 +204,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu) | |||
202 | pdev = platform_device_alloc(DRVNAME, cpu); | 204 | pdev = platform_device_alloc(DRVNAME, cpu); |
203 | if (!pdev) { | 205 | if (!pdev) { |
204 | err = -ENOMEM; | 206 | err = -ENOMEM; |
205 | printk(KERN_ERR DRVNAME ": Device allocation failed\n"); | 207 | pr_err("Device allocation failed\n"); |
206 | goto exit; | 208 | goto exit; |
207 | } | 209 | } |
208 | 210 | ||
@@ -214,8 +216,7 @@ static int __cpuinit via_cputemp_device_add(unsigned int cpu) | |||
214 | 216 | ||
215 | err = platform_device_add(pdev); | 217 | err = platform_device_add(pdev); |
216 | if (err) { | 218 | if (err) { |
217 | printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", | 219 | pr_err("Device addition failed (%d)\n", err); |
218 | err); | ||
219 | goto exit_device_free; | 220 | goto exit_device_free; |
220 | } | 221 | } |
221 | 222 | ||
@@ -295,8 +296,7 @@ static int __init via_cputemp_init(void) | |||
295 | continue; | 296 | continue; |
296 | 297 | ||
297 | if (c->x86_model > 0x0f) { | 298 | if (c->x86_model > 0x0f) { |
298 | printk(KERN_WARNING DRVNAME ": Unknown CPU " | 299 | pr_warn("Unknown CPU model 0x%x\n", c->x86_model); |
299 | "model 0x%x\n", c->x86_model); | ||
300 | continue; | 300 | continue; |
301 | } | 301 | } |
302 | 302 | ||