From 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 20 Oct 2010 06:51:32 +0000 Subject: [PATCH] hwmon: (dme1737) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck --- drivers/hwmon/dme1737.c | 12 ++++++------ 1 file 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 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -2446,7 +2448,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr) /* Get the base address of the runtime registers */ if (!(base_addr = (dme1737_sio_inb(sio_cip, 0x60) << 8) | dme1737_sio_inb(sio_cip, 0x61))) { - printk(KERN_ERR "dme1737: Base address not set.\n"); + pr_err("Base address not set\n"); err = -ENODEV; goto exit; } @@ -2475,20 +2477,18 @@ static int __init dme1737_isa_device_add(unsigned short addr) goto exit; if (!(pdev = platform_device_alloc("dme1737", addr))) { - printk(KERN_ERR "dme1737: Failed to allocate device.\n"); + pr_err("Failed to allocate device\n"); err = -ENOMEM; goto exit; } if ((err = platform_device_add_resources(pdev, &res, 1))) { - printk(KERN_ERR "dme1737: Failed to add device resource " - "(err = %d).\n", err); + pr_err("Failed to add device resource (err = %d)\n", err); goto exit_device_put; } if ((err = platform_device_add(pdev))) { - printk(KERN_ERR "dme1737: Failed to add device (err = %d).\n", - err); + pr_err("Failed to add device (err = %d)\n", err); goto exit_device_put; } -- GitLab