diff options
author | Joe Perches <joe@perches.com> | 2010-10-20 02:51:48 -0400 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-01-08 13:55:19 -0500 |
commit | bf1a85eff87eeb0651b1c5b348d51206ec7c0ef5 (patch) | |
tree | dcbd01056fb61045a4c01cc3879b7e7f7543c763 /drivers/hwmon/smsc47b397.c | |
parent | 4b2515dbb94341db01db3208f9f40658c5e2a251 (diff) |
hwmon: (smsc47b397) 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/smsc47b397.c')
-rw-r--r-- | drivers/hwmon/smsc47b397.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c index f46d936c12da..9fb7516e6f45 100644 --- a/drivers/hwmon/smsc47b397.c +++ b/drivers/hwmon/smsc47b397.c | |||
@@ -26,6 +26,8 @@ | |||
26 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
30 | |||
29 | #include <linux/module.h> | 31 | #include <linux/module.h> |
30 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
31 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
@@ -311,21 +313,19 @@ static int __init smsc47b397_device_add(unsigned short address) | |||
311 | pdev = platform_device_alloc(DRVNAME, address); | 313 | pdev = platform_device_alloc(DRVNAME, address); |
312 | if (!pdev) { | 314 | if (!pdev) { |
313 | err = -ENOMEM; | 315 | err = -ENOMEM; |
314 | printk(KERN_ERR DRVNAME ": Device allocation failed\n"); | 316 | pr_err("Device allocation failed\n"); |
315 | goto exit; | 317 | goto exit; |
316 | } | 318 | } |
317 | 319 | ||
318 | err = platform_device_add_resources(pdev, &res, 1); | 320 | err = platform_device_add_resources(pdev, &res, 1); |
319 | if (err) { | 321 | if (err) { |
320 | printk(KERN_ERR DRVNAME ": Device resource addition failed " | 322 | pr_err("Device resource addition failed (%d)\n", err); |
321 | "(%d)\n", err); | ||
322 | goto exit_device_put; | 323 | goto exit_device_put; |
323 | } | 324 | } |
324 | 325 | ||
325 | err = platform_device_add(pdev); | 326 | err = platform_device_add(pdev); |
326 | if (err) { | 327 | if (err) { |
327 | printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n", | 328 | pr_err("Device addition failed (%d)\n", err); |
328 | err); | ||
329 | goto exit_device_put; | 329 | goto exit_device_put; |
330 | } | 330 | } |
331 | 331 | ||
@@ -367,8 +367,7 @@ static int __init smsc47b397_find(unsigned short *addr) | |||
367 | *addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8) | 367 | *addr = (superio_inb(SUPERIO_REG_BASE_MSB) << 8) |
368 | | superio_inb(SUPERIO_REG_BASE_LSB); | 368 | | superio_inb(SUPERIO_REG_BASE_LSB); |
369 | 369 | ||
370 | printk(KERN_INFO DRVNAME ": found SMSC %s " | 370 | pr_info("found SMSC %s (base address 0x%04x, revision %u)\n", |
371 | "(base address 0x%04x, revision %u)\n", | ||
372 | name, *addr, rev); | 371 | name, *addr, rev); |
373 | 372 | ||
374 | superio_exit(); | 373 | superio_exit(); |