diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2009-03-18 04:35:09 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2009-03-25 05:07:04 -0400 |
commit | 143a2e54bf53216674eada16e8953f48b159e08a (patch) | |
tree | 009497fad6a7d28aae80f490007ce78736afb82c /drivers/watchdog/advantechwdt.c | |
parent | d5c26a597782d4109869abbcc36983969f964864 (diff) |
[WATCHDOG] More coding-style and trivial clean-up
Some more cleaning-up of the watchdog drivers.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/advantechwdt.c')
-rw-r--r-- | drivers/watchdog/advantechwdt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c index a1d7856ea6e0..824d076a5cd6 100644 --- a/drivers/watchdog/advantechwdt.c +++ b/drivers/watchdog/advantechwdt.c | |||
@@ -138,7 +138,9 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
138 | void __user *argp = (void __user *)arg; | 138 | void __user *argp = (void __user *)arg; |
139 | int __user *p = argp; | 139 | int __user *p = argp; |
140 | static struct watchdog_info ident = { | 140 | static struct watchdog_info ident = { |
141 | .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE, | 141 | .options = WDIOF_KEEPALIVEPING | |
142 | WDIOF_SETTIMEOUT | | ||
143 | WDIOF_MAGICCLOSE, | ||
142 | .firmware_version = 1, | 144 | .firmware_version = 1, |
143 | .identity = WATCHDOG_NAME, | 145 | .identity = WATCHDOG_NAME, |
144 | }; | 146 | }; |
@@ -259,7 +261,8 @@ static int __devinit advwdt_probe(struct platform_device *dev) | |||
259 | goto unreg_stop; | 261 | goto unreg_stop; |
260 | } | 262 | } |
261 | 263 | ||
262 | /* Check that the heartbeat value is within it's range ; if not reset to the default */ | 264 | /* Check that the heartbeat value is within it's range ; |
265 | * if not reset to the default */ | ||
263 | if (advwdt_set_heartbeat(timeout)) { | 266 | if (advwdt_set_heartbeat(timeout)) { |
264 | advwdt_set_heartbeat(WATCHDOG_TIMEOUT); | 267 | advwdt_set_heartbeat(WATCHDOG_TIMEOUT); |
265 | printk(KERN_INFO PFX | 268 | printk(KERN_INFO PFX |