aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/alim7101_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2009-04-14 16:20:07 -0400
committerWim Van Sebroeck <wim@iguana.be>2009-06-18 03:30:30 -0400
commita77dba7e444a6618cbb666d1b42b79842b9c0171 (patch)
treef8e16e2515e83eba774fd06bfca1080c7fa46adc /drivers/watchdog/alim7101_wdt.c
parent0a7e658226d66a259097db5f4734589604b303fd (diff)
[WATCHDOG] Some more general cleanup
Clean-up the watchdog drivers so that checkpatch.pl get's happy... Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/alim7101_wdt.c')
-rw-r--r--drivers/watchdog/alim7101_wdt.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index 90f98df5f106..f90afdb1b255 100644
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -322,7 +322,8 @@ static int wdt_notify_sys(struct notifier_block *this,
322 * watchdog on reboot with no heartbeat 322 * watchdog on reboot with no heartbeat
323 */ 323 */
324 wdt_change(WDT_ENABLE); 324 wdt_change(WDT_ENABLE);
325 printk(KERN_INFO PFX "Watchdog timer is now enabled with no heartbeat - should reboot in ~1 second.\n"); 325 printk(KERN_INFO PFX "Watchdog timer is now enabled "
326 "with no heartbeat - should reboot in ~1 second.\n");
326 } 327 }
327 return NOTIFY_DONE; 328 return NOTIFY_DONE;
328} 329}
@@ -374,12 +375,17 @@ static int __init alim7101_wdt_init(void)
374 pci_dev_put(ali1543_south); 375 pci_dev_put(ali1543_south);
375 if ((tmp & 0x1e) == 0x00) { 376 if ((tmp & 0x1e) == 0x00) {
376 if (!use_gpio) { 377 if (!use_gpio) {
377 printk(KERN_INFO PFX "Detected old alim7101 revision 'a1d'. If this is a cobalt board, set the 'use_gpio' module parameter.\n"); 378 printk(KERN_INFO PFX
379 "Detected old alim7101 revision 'a1d'. "
380 "If this is a cobalt board, set the 'use_gpio' "
381 "module parameter.\n");
378 goto err_out; 382 goto err_out;
379 } 383 }
380 nowayout = 1; 384 nowayout = 1;
381 } else if ((tmp & 0x1e) != 0x12 && (tmp & 0x1e) != 0x00) { 385 } else if ((tmp & 0x1e) != 0x12 && (tmp & 0x1e) != 0x00) {
382 printk(KERN_INFO PFX "ALi 1543 South-Bridge does not have the correct revision number (???1001?) - WDT not set\n"); 386 printk(KERN_INFO PFX
387 "ALi 1543 South-Bridge does not have the correct "
388 "revision number (???1001?) - WDT not set\n");
383 goto err_out; 389 goto err_out;
384 } 390 }
385 391
@@ -409,7 +415,8 @@ static int __init alim7101_wdt_init(void)
409 if (nowayout) 415 if (nowayout)
410 __module_get(THIS_MODULE); 416 __module_get(THIS_MODULE);
411 417
412 printk(KERN_INFO PFX "WDT driver for ALi M7101 initialised. timeout=%d sec (nowayout=%d)\n", 418 printk(KERN_INFO PFX "WDT driver for ALi M7101 initialised. "
419 "timeout=%d sec (nowayout=%d)\n",
413 timeout, nowayout); 420 timeout, nowayout);
414 return 0; 421 return 0;
415 422