aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-07-20 21:47:55 +0000
committerWim Van Sebroeck <wim@iguana.be>2007-07-23 17:24:38 +0000
commitf1a08cc9a1a8f1da79ca751469ecff82be110482 (patch)
tree6fbaa129dd1445de663596e665a874ad0cda5393
parentde81225a8719494f5149980ea8a50de28da653f6 (diff)
[WATCHDOG] davinci_wdt clean-up
* Remove the redundant check for pwrite(), given that the open() routine already invokes nonseekable_open(). * The WDIOF_CARDRESET flag can only be used when you can read this status via the WDIOC_GETSTATUS ioctl call. * Add the mandatory WDIOC_GETBOOTSTATUS ioctl call. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/char/watchdog/davinci_wdt.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/char/watchdog/davinci_wdt.c b/drivers/char/watchdog/davinci_wdt.c
index 27b4f66c000..19db5302ba6 100644
--- a/drivers/char/watchdog/davinci_wdt.c
+++ b/drivers/char/watchdog/davinci_wdt.c
@@ -132,10 +132,6 @@ static ssize_t
davinci_wdt_write(struct file *file, const char *data, size_t len,
loff_t *ppos)
{
- /* Can't seek (pwrite) on this device */
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
if (len)
wdt_service();
@@ -143,7 +139,7 @@ davinci_wdt_write(struct file *file, const char *data, size_t len,
}
static struct watchdog_info ident = {
- .options = WDIOF_CARDRESET | WDIOF_KEEPALIVEPING,
+ .options = WDIOF_KEEPALIVEPING,
.identity = "DaVinci Watchdog",
};
@@ -160,6 +156,7 @@ davinci_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
break;
case WDIOC_GETSTATUS:
+ case WDIOC_GETBOOTSTATUS:
ret = put_user(0, (int *)arg);
break;