Commit f8bb8925 authored by Joe Perches's avatar Joe Perches Committed by Guenter Roeck

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent ac561494
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
* 02110-1301 USA. * 02110-1301 USA.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -445,8 +447,8 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) ...@@ -445,8 +447,8 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
* without thermal sensors will be filtered out. * without thermal sensors will be filtered out.
*/ */
if (!cpu_has(c, X86_FEATURE_DTS)) { if (!cpu_has(c, X86_FEATURE_DTS)) {
printk(KERN_INFO DRVNAME ": CPU (model=0x%x)" pr_info("CPU (model=0x%x) has no thermal sensor\n",
" has no thermal sensor.\n", c->x86_model); c->x86_model);
return 0; return 0;
} }
...@@ -466,7 +468,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) ...@@ -466,7 +468,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
pdev = platform_device_alloc(DRVNAME, cpu); pdev = platform_device_alloc(DRVNAME, cpu);
if (!pdev) { if (!pdev) {
err = -ENOMEM; err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n"); pr_err("Device allocation failed\n");
goto exit; goto exit;
} }
...@@ -478,8 +480,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu) ...@@ -478,8 +480,7 @@ static int __cpuinit coretemp_device_add(unsigned int cpu)
err = platform_device_add(pdev); err = platform_device_add(pdev);
if (err) { if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", pr_err("Device addition failed (%d)\n", err);
err);
goto exit_device_free; goto exit_device_free;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment