diff options
author | Joe Perches <joe@perches.com> | 2012-02-16 00:06:19 +0100 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2012-03-27 19:59:26 +0200 |
commit | 27c766aaacb265d625dc634bf7903f7f9fd0c697 (patch) | |
tree | 06b399d21dec006bc0a3e1c6685b076753e19b94 /drivers/watchdog/shwdt.c | |
parent | watchdog: pnx4008: don't use __raw_-accessors (diff) | |
download | linux-27c766aaacb265d625dc634bf7903f7f9fd0c697.tar.xz linux-27c766aaacb265d625dc634bf7903f7f9fd0c697.zip |
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/shwdt.c')
-rw-r--r-- | drivers/watchdog/shwdt.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c index a267dc078daf..75bd23926476 100644 --- a/drivers/watchdog/shwdt.c +++ b/drivers/watchdog/shwdt.c @@ -17,6 +17,9 @@ * Added expect close support, made emulated timeout runtime changeable * general cleanups, add some ioctls */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> @@ -440,20 +443,20 @@ static int __init sh_wdt_init(void) clock_division_ratio > 0x7)) { clock_division_ratio = WTCSR_CKS_4096; - pr_info("%s: divisor must be 0x5<=x<=0x7, using %d\n", - DRV_NAME, clock_division_ratio); + pr_info("divisor must be 0x5<=x<=0x7, using %d\n", + clock_division_ratio); } rc = sh_wdt_set_heartbeat(heartbeat); if (unlikely(rc)) { heartbeat = WATCHDOG_HEARTBEAT; - pr_info("%s: heartbeat value must be 1<=x<=3600, using %d\n", - DRV_NAME, heartbeat); + pr_info("heartbeat value must be 1<=x<=3600, using %d\n", + heartbeat); } - pr_info("%s: configured with heartbeat=%d sec (nowayout=%d)\n", - DRV_NAME, heartbeat, nowayout); + pr_info("configured with heartbeat=%d sec (nowayout=%d)\n", + heartbeat, nowayout); return platform_driver_register(&sh_wdt_driver); } |