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/iTCO_wdt.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/iTCO_wdt.c')
-rw-r--r-- | drivers/watchdog/iTCO_wdt.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 352334947ea3..648250b998c4 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c | |||
@@ -273,7 +273,9 @@ static struct platform_device *iTCO_wdt_platform_device; | |||
273 | #define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */ | 273 | #define WATCHDOG_HEARTBEAT 30 /* 30 sec default heartbeat */ |
274 | static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */ | 274 | static int heartbeat = WATCHDOG_HEARTBEAT; /* in seconds */ |
275 | module_param(heartbeat, int, 0); | 275 | module_param(heartbeat, int, 0); |
276 | MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); | 276 | MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. " |
277 | "(2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=" | ||
278 | __MODULE_STRING(WATCHDOG_HEARTBEAT) ")"); | ||
277 | 279 | ||
278 | static int nowayout = WATCHDOG_NOWAYOUT; | 280 | static int nowayout = WATCHDOG_NOWAYOUT; |
279 | module_param(nowayout, int, 0); | 281 | module_param(nowayout, int, 0); |
@@ -346,7 +348,8 @@ static int iTCO_wdt_start(void) | |||
346 | /* disable chipset's NO_REBOOT bit */ | 348 | /* disable chipset's NO_REBOOT bit */ |
347 | if (iTCO_wdt_unset_NO_REBOOT_bit()) { | 349 | if (iTCO_wdt_unset_NO_REBOOT_bit()) { |
348 | spin_unlock(&iTCO_wdt_private.io_lock); | 350 | spin_unlock(&iTCO_wdt_private.io_lock); |
349 | printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n"); | 351 | printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, " |
352 | "reboot disabled by hardware\n"); | ||
350 | return -EIO; | 353 | return -EIO; |
351 | } | 354 | } |
352 | 355 | ||
@@ -669,7 +672,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, | |||
669 | 672 | ||
670 | /* Check chipset's NO_REBOOT bit */ | 673 | /* Check chipset's NO_REBOOT bit */ |
671 | if (iTCO_wdt_unset_NO_REBOOT_bit() && iTCO_vendor_check_noreboot_on()) { | 674 | if (iTCO_wdt_unset_NO_REBOOT_bit() && iTCO_vendor_check_noreboot_on()) { |
672 | printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n"); | 675 | printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, " |
676 | "reboot disabled by hardware\n"); | ||
673 | ret = -ENODEV; /* Cannot reset NO_REBOOT bit */ | 677 | ret = -ENODEV; /* Cannot reset NO_REBOOT bit */ |
674 | goto out; | 678 | goto out; |
675 | } | 679 | } |
@@ -716,8 +720,9 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, | |||
716 | if not reset to the default */ | 720 | if not reset to the default */ |
717 | if (iTCO_wdt_set_heartbeat(heartbeat)) { | 721 | if (iTCO_wdt_set_heartbeat(heartbeat)) { |
718 | iTCO_wdt_set_heartbeat(WATCHDOG_HEARTBEAT); | 722 | iTCO_wdt_set_heartbeat(WATCHDOG_HEARTBEAT); |
719 | printk(KERN_INFO PFX "heartbeat value must be 2 < heartbeat < 39 (TCO v1) or 613 (TCO v2), using %d\n", | 723 | printk(KERN_INFO PFX |
720 | heartbeat); | 724 | "heartbeat value must be 2 < heartbeat < 39 (TCO v1) " |
725 | "or 613 (TCO v2), using %d\n", heartbeat); | ||
721 | } | 726 | } |
722 | 727 | ||
723 | ret = misc_register(&iTCO_wdt_miscdev); | 728 | ret = misc_register(&iTCO_wdt_miscdev); |