[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>

diff --git a/drivers/char/watchdog/davinci_wdt.c b/drivers/char/watchdog/davinci_wdt.c
index 27b4f66c000b04b6bfca01178ede68abeaecf55c..19db5302ba6efffa7fde8b3077361d514fc9ecdd 100644 (file)
--- 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;