aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-07-04 02:51:32 -0400
committerWim Van Sebroeck <wim@iguana.be>2008-08-06 09:03:11 -0400
commitc9488520512df659ad21df5d100b52fed96bdf07 (patch)
tree72e64609e01ff031581f8b38da9dd9348a270b72 /drivers
parent089ab0791d127e8ada526c4b4d18b7584be8acf0 (diff)
[WATCHDOG] pcwd: a couple of watchdogs escaped conversion
Fix them up. Once we know the long term plan the watchdogs can all get shrunk massively anyway Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/pcwd_pci.c8
-rw-r--r--drivers/watchdog/pcwd_usb.c6
2 files changed, 6 insertions, 8 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
457static int pcipcwd_ioctl(struct inode *inode, struct file *file, 457static 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};
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 825102a33910..bc399cf65cf7 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -368,8 +368,8 @@ static ssize_t usb_pcwd_write(struct file *file, const char __user *data,
368 return len; 368 return len;
369} 369}
370 370
371static int usb_pcwd_ioctl(struct inode *inode, struct file *file, 371static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
372 unsigned int cmd, unsigned long arg) 372 unsigned long arg)
373{ 373{
374 void __user *argp = (void __user *)arg; 374 void __user *argp = (void __user *)arg;
375 int __user *p = argp; 375 int __user *p = argp;
@@ -534,7 +534,7 @@ static const struct file_operations usb_pcwd_fops = {
534 .owner = THIS_MODULE, 534 .owner = THIS_MODULE,
535 .llseek = no_llseek, 535 .llseek = no_llseek,
536 .write = usb_pcwd_write, 536 .write = usb_pcwd_write,
537 .ioctl = usb_pcwd_ioctl, 537 .unlocked_ioctl = usb_pcwd_ioctl,
538 .open = usb_pcwd_open, 538 .open = usb_pcwd_open,
539 .release = usb_pcwd_release, 539 .release = usb_pcwd_release,
540}; 540};