diff options
| author | Joe Perches <joe@perches.com> | 2012-02-15 15:06:19 -0800 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2012-03-27 19:59:26 +0200 |
| commit | 27c766aaacb265d625dc634bf7903f7f9fd0c697 (patch) | |
| tree | 06b399d21dec006bc0a3e1c6685b076753e19b94 /drivers/watchdog/ep93xx_wdt.c | |
| parent | 7cbc353540c31ffaf65ad44d89b955be0f1d04dc (diff) | |
watchdog: Use pr_<fmt> and pr_<level>
Use the current logging styles.
Make sure all output has a prefix.
Add missing newlines.
Remove now unnecessary PFX, NAME, and miscellaneous other #defines.
Coalesce formats.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/ep93xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 726b7df61fd0..a6532b52c457 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c @@ -23,6 +23,8 @@ * - Add a few missing ioctls */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/fs.h> #include <linux/miscdevice.h> @@ -33,7 +35,6 @@ #include <mach/hardware.h> #define WDT_VERSION "0.3" -#define PFX "ep93xx_wdt: " /* default timeout (secs) */ #define WDT_TIMEOUT 30 @@ -173,8 +174,7 @@ static int ep93xx_wdt_release(struct inode *inode, struct file *file) if (test_bit(WDT_OK_TO_CLOSE, &wdt_status)) wdt_shutdown(); else - printk(KERN_CRIT PFX - "Device closed unexpectedly - timer will not stop\n"); + pr_crit("Device closed unexpectedly - timer will not stop\n"); clear_bit(WDT_IN_USE, &wdt_status); clear_bit(WDT_OK_TO_CLOSE, &wdt_status); @@ -214,15 +214,13 @@ static int __init ep93xx_wdt_init(void) boot_status = __raw_readl(EP93XX_WDT_WATCHDOG) & 0x01 ? 1 : 0; - printk(KERN_INFO PFX "EP93XX watchdog, driver version " - WDT_VERSION "%s\n", + pr_info("EP93XX watchdog, driver version " WDT_VERSION "%s\n", (__raw_readl(EP93XX_WDT_WATCHDOG) & 0x08) ? " (nCS1 disable detected)" : ""); if (timeout < 1 || timeout > 3600) { timeout = WDT_TIMEOUT; - printk(KERN_INFO PFX - "timeout value must be 1<=x<=3600, using %d\n", + pr_info("timeout value must be 1<=x<=3600, using %d\n", timeout); } |