Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[WATCHDOG] davinci_wdt clean-up

Browse Source 
* 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>
This commit is contained in:
Wim Van Sebroeck 2007-07-20 21:47:55 +00:00
parent de81225a87
commit f1a08cc9a1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/watchdog/davinci_wdt.c
View File

@ -132,10 +132,6 @@ static ssize_t
davinci_wdt_write(struct file *file, const char *data, size_t len, davinci_wdt_write(struct file *file, const char *data, size_t len,
loff_t *ppos) loff_t *ppos)
{ {
/* Can't seek (pwrite) on this device */
if (ppos != &file->f_pos)
return -ESPIPE;
if (len) if (len)
wdt_service(); wdt_service();
@ -143,7 +139,7 @@ davinci_wdt_write(struct file *file, const char *data, size_t len,
} }
static struct watchdog_info ident = { static struct watchdog_info ident = {
.options = WDIOF_CARDRESET | WDIOF_KEEPALIVEPING, .options = WDIOF_KEEPALIVEPING,
.identity = "DaVinci Watchdog", .identity = "DaVinci Watchdog",
}; };
@ -160,6 +156,7 @@ davinci_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
break; break;
case WDIOC_GETSTATUS: case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
ret = put_user(0, (int *)arg); ret = put_user(0, (int *)arg);
break; break;