diff options
author | Joe Perches <joe@perches.com> | 2010-10-20 02:51:32 -0400 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2011-01-08 13:55:06 -0500 |
commit | 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb (patch) | |
tree | 40f57d514db99822535ffe31ea054750901d6d0c /drivers | |
parent | f8bb8925682f355dc20f721bda7021ef13e5869f (diff) |
hwmon: (dme1737) 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/dme1737.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c index 980c17d5eeae..e9a610bfd0cc 100644 --- a/drivers/hwmon/dme1737.c +++ b/drivers/hwmon/dme1737.c | |||
@@ -25,6 +25,8 @@ | |||
25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 25 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
29 | |||
28 | #include <linux/module.h> | 30 | #include <linux/module.h> |
29 | #include <linux/init.h> | 31 | #include <linux/init.h> |
30 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
@@ -2446,7 +2448,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr) | |||
2446 | /* Get the base address of the runtime registers */ | 2448 | /* Get the base address of the runtime registers */ |
2447 | if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) | | 2449 | if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) | |
2448 | dme1737_sio_inb(sio_cip, 0x61))) { | 2450 | dme1737_sio_inb(sio_cip, 0x61))) { |
2449 | printk(KERN_ERR "dme1737: Base address not set.\n"); | 2451 | pr_err("Base address not set\n"); |
2450 | err = -ENODEV; | 2452 | err = -ENODEV; |
2451 | goto exit; | 2453 | goto exit; |
2452 | } | 2454 | } |
@@ -2475,20 +2477,18 @@ static int __init dme1737_isa_device_add(unsigned short addr) | |||
2475 | goto exit; | 2477 | goto exit; |
2476 | 2478 | ||
2477 | if (!(pdev = platform_device_alloc("dme1737", addr))) { | 2479 | if (!(pdev = platform_device_alloc("dme1737", addr))) { |
2478 | printk(KERN_ERR "dme1737: Failed to allocate device.\n"); | 2480 | pr_err("Failed to allocate device\n"); |
2479 | err = -ENOMEM; | 2481 | err = -ENOMEM; |
2480 | goto exit; | 2482 | goto exit; |
2481 | } | 2483 | } |
2482 | 2484 | ||
2483 | if ((err = platform_device_add_resources(pdev, &res, 1))) { | 2485 | if ((err = platform_device_add_resources(pdev, &res, 1))) { |
2484 | printk(KERN_ERR "dme1737: Failed to add device resource " | 2486 | pr_err("Failed to add device resource (err = %d)\n", err); |
2485 | "(err = %d).\n", err); | ||
2486 | goto exit_device_put; | 2487 | goto exit_device_put; |
2487 | } | 2488 | } |
2488 | 2489 | ||
2489 | if ((err = platform_device_add(pdev))) { | 2490 | if ((err = platform_device_add(pdev))) { |
2490 | printk(KERN_ERR "dme1737: Failed to add device (err = %d).\n", | 2491 | pr_err("Failed to add device (err = %d)\n", err); |
2491 | err); | ||
2492 | goto exit_device_put; | 2492 | goto exit_device_put; |
2493 | } | 2493 | } |
2494 | 2494 | ||