diff options
author | Joe Perches <joe@perches.com> | 2010-10-20 02:51:36 -0400 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-01-08 13:55:10 -0500 |
commit | 1f923c7a6726b224b6b1b059da5a7f8e3dff1196 (patch) | |
tree | c3d7c69967fec0fb16e5c3417653103312bd6348 /drivers/hwmon | |
parent | 53ab0e6888925ae3ebe931c060120b0f11c1923c (diff) |
hwmon: (hwmon-vid) 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')
-rw-r--r-- | drivers/hwmon/hwmon-vid.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c index 2b2ca1694f95..2582bfef6ccb 100644 --- a/drivers/hwmon/hwmon-vid.c +++ b/drivers/hwmon/hwmon-vid.c | |||
@@ -22,6 +22,8 @@ | |||
22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
26 | |||
25 | #include <linux/module.h> | 27 | #include <linux/module.h> |
26 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
27 | #include <linux/hwmon-vid.h> | 29 | #include <linux/hwmon-vid.h> |
@@ -146,8 +148,8 @@ int vid_from_reg(int val, u8 vrm) | |||
146 | return(val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000); | 148 | return(val > 0x77 ? 0 : (1500000 - (val * 12500) + 500) / 1000); |
147 | default: /* report 0 for unknown */ | 149 | default: /* report 0 for unknown */ |
148 | if (vrm) | 150 | if (vrm) |
149 | printk(KERN_WARNING "hwmon-vid: Requested unsupported " | 151 | pr_warn("Requested unsupported VRM version (%u)\n", |
150 | "VRM version (%u)\n", (unsigned int)vrm); | 152 | (unsigned int)vrm); |
151 | return 0; | 153 | return 0; |
152 | } | 154 | } |
153 | } | 155 | } |
@@ -246,8 +248,7 @@ u8 vid_which_vrm(void) | |||
246 | } | 248 | } |
247 | vrm_ret = find_vrm(eff_family, eff_model, eff_stepping, c->x86_vendor); | 249 | vrm_ret = find_vrm(eff_family, eff_model, eff_stepping, c->x86_vendor); |
248 | if (vrm_ret == 0) | 250 | if (vrm_ret == 0) |
249 | printk(KERN_INFO "hwmon-vid: Unknown VRM version of your " | 251 | pr_info("Unknown VRM version of your x86 CPU\n"); |
250 | "x86 CPU\n"); | ||
251 | return vrm_ret; | 252 | return vrm_ret; |
252 | } | 253 | } |
253 | 254 | ||
@@ -255,7 +256,7 @@ u8 vid_which_vrm(void) | |||
255 | #else | 256 | #else |
256 | u8 vid_which_vrm(void) | 257 | u8 vid_which_vrm(void) |
257 | { | 258 | { |
258 | printk(KERN_INFO "hwmon-vid: Unknown VRM version of your CPU\n"); | 259 | pr_info("Unknown VRM version of your CPU\n"); |
259 | return 0; | 260 | return 0; |
260 | } | 261 | } |
261 | #endif | 262 | #endif |