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/txx9wdt.c | |
| parent | 7cbc353540c31ffaf65ad44d89b955be0f1d04dc (diff) | |
| download | kernel_goldelico_gta04-27c766aaacb265d625dc634bf7903f7f9fd0c697.zip kernel_goldelico_gta04-27c766aaacb265d625dc634bf7903f7f9fd0c697.tar.gz kernel_goldelico_gta04-27c766aaacb265d625dc634bf7903f7f9fd0c697.tar.bz2 | |
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/txx9wdt.c')
| -rw-r--r-- | drivers/watchdog/txx9wdt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c index 9e9ed7b..99204a8 100644 --- a/drivers/watchdog/txx9wdt.c +++ b/drivers/watchdog/txx9wdt.c @@ -7,6 +7,9 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h> @@ -96,8 +99,7 @@ static int txx9wdt_release(struct inode *inode, struct file *file) if (expect_close) txx9wdt_stop(); else { - printk(KERN_CRIT "txx9wdt: " - "Unexpected close, not stopping watchdog!\n"); + pr_crit("Unexpected close, not stopping watchdog!\n"); txx9wdt_ping(); } clear_bit(0, &txx9wdt_alive); @@ -213,9 +215,8 @@ static int __init txx9wdt_probe(struct platform_device *dev) goto exit; } - printk(KERN_INFO "Hardware Watchdog Timer for TXx9: " - "timeout=%d sec (max %ld) (nowayout= %d)\n", - timeout, WD_MAX_TIMEOUT, nowayout); + pr_info("Hardware Watchdog Timer: timeout=%d sec (max %ld) (nowayout= %d)\n", + timeout, WD_MAX_TIMEOUT, nowayout); return 0; exit_busy: |