diff options
Diffstat (limited to 'drivers/watchdog/pcwd_pci.c')
-rw-r--r-- | drivers/watchdog/pcwd_pci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c index a1d31d1f750f..67d90810c6e9 100644 --- a/drivers/watchdog/pcwd_pci.c +++ b/drivers/watchdog/pcwd_pci.c | |||
@@ -454,8 +454,8 @@ static ssize_t pcipcwd_write(struct file *file, const char __user *data, | |||
454 | return len; | 454 | return len; |
455 | } | 455 | } |
456 | 456 | ||
457 | static int pcipcwd_ioctl(struct inode *inode, struct file *file, | 457 | static long pcipcwd_ioctl(struct file *file, unsigned int cmd, |
458 | unsigned int cmd, unsigned long arg) | 458 | unsigned long arg) |
459 | { | 459 | { |
460 | void __user *argp = (void __user *)arg; | 460 | void __user *argp = (void __user *)arg; |
461 | int __user *p = argp; | 461 | int __user *p = argp; |
@@ -477,9 +477,7 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file, | |||
477 | case WDIOC_GETSTATUS: | 477 | case WDIOC_GETSTATUS: |
478 | { | 478 | { |
479 | int status; | 479 | int status; |
480 | |||
481 | pcipcwd_get_status(&status); | 480 | pcipcwd_get_status(&status); |
482 | |||
483 | return put_user(status, p); | 481 | return put_user(status, p); |
484 | } | 482 | } |
485 | 483 | ||
@@ -643,7 +641,7 @@ static const struct file_operations pcipcwd_fops = { | |||
643 | .owner = THIS_MODULE, | 641 | .owner = THIS_MODULE, |
644 | .llseek = no_llseek, | 642 | .llseek = no_llseek, |
645 | .write = pcipcwd_write, | 643 | .write = pcipcwd_write, |
646 | .ioctl = pcipcwd_ioctl, | 644 | .unlocked_ioctl = pcipcwd_ioctl, |
647 | .open = pcipcwd_open, | 645 | .open = pcipcwd_open, |
648 | .release = pcipcwd_release, | 646 | .release = pcipcwd_release, |
649 | }; | 647 | }; |