projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
at91sam9_wdt.c
diff --git
a/drivers/watchdog/at91sam9_wdt.c
b/drivers/watchdog/at91sam9_wdt.c
index 00562566ef5f2773b006c80a7981cb5da56c7867..05e1be85fdeeda07a21651ee1a4096bf6b77c06d 100644
(file)
--- a/
drivers/watchdog/at91sam9_wdt.c
+++ b/
drivers/watchdog/at91sam9_wdt.c
@@
-15,6
+15,8
@@
* bootloader doesn't write to this register.
*/
* bootloader doesn't write to this register.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/init.h>
@@
-60,8
+62,8
@@
module_param(heartbeat, int, 0);
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
"(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. "
"(default = " __MODULE_STRING(WDT_HEARTBEAT) ")");
-static
int
nowayout = WATCHDOG_NOWAYOUT;
-module_param(nowayout,
int
, 0);
+static
bool
nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout,
bool
, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
"(default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
@@
-96,7
+98,7
@@
static void at91_ping(unsigned long data)
at91_wdt_reset();
mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);
} else
at91_wdt_reset();
mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);
} else
- pr
intk(KERN_CRIT DRV_NAME":
I will reset your machine !\n");
+ pr
_crit("
I will reset your machine !\n");
}
/*
}
/*
@@
-140,7
+142,7
@@
static int at91_wdt_settimeout(unsigned int timeout)
/* Check if disabled */
mr = wdt_read(AT91_WDT_MR);
if (mr & AT91_WDT_WDDIS) {
/* Check if disabled */
mr = wdt_read(AT91_WDT_MR);
if (mr & AT91_WDT_WDDIS) {
- pr
intk(KERN_ERR DRV_NAME":
sorry, watchdog is disabled\n");
+ pr
_err("
sorry, watchdog is disabled\n");
return -EIO;
}
return -EIO;
}
@@
-283,7
+285,7
@@
static int __init at91wdt_probe(struct platform_device *pdev)
setup_timer(&at91wdt_private.timer, at91_ping, 0);
mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);
setup_timer(&at91wdt_private.timer, at91_ping, 0);
mod_timer(&at91wdt_private.timer, jiffies + WDT_TIMEOUT);
- pr
intk(KERN_INFO DRV_NAME "
enabled (heartbeat=%d sec, nowayout=%d)\n",
+ pr
_info("
enabled (heartbeat=%d sec, nowayout=%d)\n",
heartbeat, nowayout);
return 0;
heartbeat, nowayout);
return 0;