git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
wdt285.c
diff --git
a/drivers/char/watchdog/wdt285.c
b/drivers/char/watchdog/wdt285.c
index
b61d9e1
..
e4cf661
100644
(file)
--- a/
drivers/char/watchdog/wdt285.c
+++ b/
drivers/char/watchdog/wdt285.c
@@
-46,7
+46,7
@@
static unsigned long timer_alive;
/*
* If the timer expires..
*/
/*
* If the timer expires..
*/
-static void watchdog_fire(int irq, void *dev_id
, struct pt_regs *regs
)
+static void watchdog_fire(int irq, void *dev_id)
{
printk(KERN_CRIT "Watchdog: Would Reboot.\n");
*CSR_TIMER4_CNTL = 0;
{
printk(KERN_CRIT "Watchdog: Would Reboot.\n");
*CSR_TIMER4_CNTL = 0;
@@
-97,6
+97,7
@@
static int watchdog_open(struct inode *inode, struct file *file)
ret = 0;
#endif
ret = 0;
#endif
+ nonseekable_open(inode, file);
return ret;
}
return ret;
}
@@
-117,10
+118,6
@@
static int watchdog_release(struct inode *inode, struct file *file)
static ssize_t
watchdog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
{
static ssize_t
watchdog_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;
-
/*
* Refresh the timer.
*/
/*
* Refresh the timer.
*/
@@
-140,7
+137,7
@@
watchdog_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
unsigned int new_margin;
unsigned long arg)
{
unsigned int new_margin;
- int ret = -ENO
IOCTLCMD
;
+ int ret = -ENO
TTY
;
switch(cmd) {
case WDIOC_GETSUPPORT:
switch(cmd) {
case WDIOC_GETSUPPORT:
@@
-181,8
+178,9
@@
watchdog_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
return ret;
}
return ret;
}
-static struct file_operations watchdog_fops = {
+static
const
struct file_operations watchdog_fops = {
.owner = THIS_MODULE,
.owner = THIS_MODULE,
+ .llseek = no_llseek,
.write = watchdog_write,
.ioctl = watchdog_ioctl,
.open = watchdog_open,
.write = watchdog_write,
.ioctl = watchdog_ioctl,
.open = watchdog_open,