Commit 6039f269 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck

[WATCHDOG] sbc60xxwdt.c patch5

some last clean-ups
parent f1700534
...@@ -342,6 +342,13 @@ static int __init sbc60xxwdt_init(void) ...@@ -342,6 +342,13 @@ static int __init sbc60xxwdt_init(void)
{ {
int rc = -EBUSY; int rc = -EBUSY;
if(timeout < 1 || timeout > 3600) /* arbitrary upper limit */
{
timeout = WATCHDOG_TIMEOUT;
printk(KERN_INFO PFX "timeout value must be 1<=x<=3600, using %d\n",
timeout);
}
if (!request_region(wdt_start, 1, "SBC 60XX WDT")) if (!request_region(wdt_start, 1, "SBC 60XX WDT"))
{ {
printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
...@@ -361,13 +368,6 @@ static int __init sbc60xxwdt_init(void) ...@@ -361,13 +368,6 @@ static int __init sbc60xxwdt_init(void)
} }
} }
if(timeout < 1 || timeout > 3600) /* arbitrary upper limit */
{
timeout = WATCHDOG_TIMEOUT;
printk(KERN_INFO PFX "timeout value must be 1<=x<=3600, using %d\n",
timeout);
}
init_timer(&timer); init_timer(&timer);
timer.function = wdt_timer_ping; timer.function = wdt_timer_ping;
timer.data = 0; timer.data = 0;
...@@ -388,7 +388,8 @@ static int __init sbc60xxwdt_init(void) ...@@ -388,7 +388,8 @@ static int __init sbc60xxwdt_init(void)
goto err_out_miscdev; goto err_out_miscdev;
} }
printk(KERN_INFO PFX "WDT driver for 60XX single board computer initialised.\n"); printk(KERN_INFO PFX "WDT driver for 60XX single board computer initialised. timeout=%d sec (nowayout=%d)\n",
timeout, nowayout);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment