summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/drivers/watchdog
diff options
context:
space:
mode:
authorJérémy Dufour2012-09-13 16:29:59 +0200
committerJérémy Dufour2012-10-18 10:25:02 +0200
commit170f0719464382c7a45dbae9d6459daa7cbc6e1c (patch)
tree1756c0d25bf51791744442af98dbcf39e832ef46 /cleopatre/linux-2.6.25.10-spc300/drivers/watchdog
parentfd9d68756946fb3fec5718acd39d526dca9408d2 (diff)
{cleo,polux}/linux: simplify watchdog API, closes #3296
The function spc300_wdt_stop is removed: we can not stop the watchdog. The functions spc300_wdt_restart and spc300_wdt_settimeout are replaced by spc300_wdt_start.
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/drivers/watchdog')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/watchdog/spc300_wdt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/watchdog/spc300_wdt.c b/cleopatre/linux-2.6.25.10-spc300/drivers/watchdog/spc300_wdt.c
index b4880ad6c0..96dc405529 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/watchdog/spc300_wdt.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/watchdog/spc300_wdt.c
@@ -117,7 +117,7 @@ static int spc300_wdt_ioctl(struct inode *inode, struct file *file, unsigned int
if(get_user(new_value, p))
return -EFAULT;
- if(spc300_wdt_restart(new_value))
+ if(spc300_wdt_start(new_value))
return -EINVAL;
else
wdt_time = spc300_wdt_gettimeout();
@@ -137,9 +137,9 @@ static int spc300_wdt_ioctl(struct inode *inode, struct file *file, unsigned int
return -EFAULT;
if(new_value & WDIOS_DISABLECARD)
- spc300_wdt_stop();
+ return -EPERM;
if(new_value & WDIOS_ENABLECARD)
- spc300_wdt_start();
+ spc300_wdt_start(0);
return 0;
default:
@@ -197,7 +197,7 @@ static int __init spc300_wdt_probe(struct platform_device *pdev)
if(res)
return res;
- spc300_wdt_restart(wdt_time);
+ spc300_wdt_start(wdt_time);
wdt_time = spc300_wdt_gettimeout();
printk("SPC300 Watchdog Timer for User Mode prepared (%d seconds%s)\n", wdt_time, nowayout ? ", nowayout" : "");
return 0;