diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 08:28:35 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-22 08:28:35 +0200 |
| commit | 57b8628bb0ac4e47c806e45c5bbd89282e93869b (patch) | |
| tree | ee9289f0898054474b7e5054abdb3ffb78666436 /drivers/watchdog/sa1100_wdt.c | |
| parent | Input: serio_raw - ensure we don't block in non-blocking read (diff) | |
| parent | Linux 3.4-rc4 (diff) | |
| download | linux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.tar.xz linux-57b8628bb0ac4e47c806e45c5bbd89282e93869b.zip | |
Merge commit 'v3.4-rc4' into next
Diffstat (limited to 'drivers/watchdog/sa1100_wdt.c')
| -rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index 016245419fad..54984deb8561 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -17,6 +17,9 @@ * * 27/11/2000 Initial release */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h> @@ -25,6 +28,7 @@ #include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/bitops.h> #include <linux/uaccess.h> #include <linux/timex.h> @@ -66,7 +70,7 @@ static int sa1100dog_open(struct inode *inode, struct file *file) */ static int sa1100dog_release(struct inode *inode, struct file *file) { - printk(KERN_CRIT "WATCHDOG: Device closed - timer will not stop\n"); + pr_crit("Device closed - timer will not stop\n"); clear_bit(1, &sa1100wdt_users); return 0; } @@ -169,9 +173,8 @@ static int __init sa1100dog_init(void) ret = misc_register(&sa1100dog_miscdev); if (ret == 0) - printk(KERN_INFO - "SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n", - margin); + pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n", + margin); return ret; } |