diff options
author | Joe Perches <joe@perches.com> | 2010-10-20 02:51:31 -0400 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-01-08 13:55:05 -0500 |
commit | f8bb8925682f355dc20f721bda7021ef13e5869f (patch) | |
tree | d4d66f107f31ff2d28d92ec9eda46be662149166 /drivers | |
parent | ac561494d48b92a41424cc87e2a02b545424643c (diff) |
hwmon: (coretemp) 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')
-rw-r--r-- | 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 42de98d73ff5..194ca0aa8b0c 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
@@ -20,6 +20,8 @@ | |||
20 | * 02110-1301 USA. | 20 | * 02110-1301 USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
24 | |||
23 | #include <linux/module.h> | 25 | #include <linux/module.h> |
24 | #include <linux/init.h> | 26 | #include <linux/init.h> |
25 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
@@ -445,8 +447,8 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) | |||
445 | * without thermal sensors will be filtered out. | 447 | * without thermal sensors will be filtered out. |
446 | */ | 448 | */ |
447 | if (!cpu_has(c, X86_FEATURE_DTS)) { | 449 | if (!cpu_has(c, X86_FEATURE_DTS)) { |
448 | printk(KERN_INFO DRVNAME ": CPU (model=0x%x)" | 450 | pr_info("CPU (model=0x%x) has no thermal sensor\n", |
449 | " has no thermal sensor.\n", c->x86_model); | 451 | c->x86_model); |
450 | return 0; | 452 | return 0; |
451 | } | 453 | } |
452 | 454 | ||
@@ -466,7 +468,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) | |||
466 | pdev = platform_device_alloc(DRVNAME, cpu); | 468 | pdev = platform_device_alloc(DRVNAME, cpu); |
467 | if (!pdev) { | 469 | if (!pdev) { |
468 | err = -ENOMEM; | 470 | err = -ENOMEM; |
469 | printk(KERN_ERR DRVNAME ": Device allocation failed\n"); | 471 | pr_err("Device allocation failed\n"); |
470 | goto exit; | 472 | goto exit; |
471 | } | 473 | } |
472 | 474 | ||
@@ -478,8 +480,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) | |||
478 | 480 | ||
479 | err = platform_device_add(pdev); | 481 | err = platform_device_add(pdev); |
480 | if (err) { | 482 | if (err) { |
481 | printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", | 483 | pr_err("Device addition failed (%d)\n", err); |
482 | err); | ||
483 | goto exit_device_free; | 484 | goto exit_device_free; |
484 | } | 485 | } |
485 | 486 | ||