From: Alan Cox <alan@lxorguk.ukuu.org.uk>

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>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/watchdog/pcwd_pci.c |    8 +++-----
 drivers/watchdog/pcwd_usb.c |    6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff -puN drivers/watchdog/pcwd_pci.c~pcwd-a-couple-of-watchdogs-escaped-conversion drivers/watchdog/pcwd_pci.c
--- a/drivers/watchdog/pcwd_pci.c~pcwd-a-couple-of-watchdogs-escaped-conversion
+++ a/drivers/watchdog/pcwd_pci.c
@@ -455,8 +455,8 @@ static ssize_t pcipcwd_write(struct file
 	return len;
 }
 
-static int pcipcwd_ioctl(struct inode *inode, struct file *file,
-			  unsigned int cmd, unsigned long arg)
+static long pcipcwd_ioctl(struct file *file, unsigned int cmd,
+						unsigned long arg)
 {
 	void __user *argp = (void __user *)arg;
 	int __user *p = argp;
@@ -478,9 +478,7 @@ static int pcipcwd_ioctl(struct inode *i
 		case WDIOC_GETSTATUS:
 		{
 			int status;
-
 			pcipcwd_get_status(&status);
-
 			return put_user(status, p);
 		}
 
@@ -644,7 +642,7 @@ static const struct file_operations pcip
 	.owner =	THIS_MODULE,
 	.llseek =	no_llseek,
 	.write =	pcipcwd_write,
-	.ioctl =	pcipcwd_ioctl,
+	.unlocked_ioctl = pcipcwd_ioctl,
 	.open =		pcipcwd_open,
 	.release =	pcipcwd_release,
 };
diff -puN drivers/watchdog/pcwd_usb.c~pcwd-a-couple-of-watchdogs-escaped-conversion drivers/watchdog/pcwd_usb.c
--- a/drivers/watchdog/pcwd_usb.c~pcwd-a-couple-of-watchdogs-escaped-conversion
+++ a/drivers/watchdog/pcwd_usb.c
@@ -369,8 +369,8 @@ static ssize_t usb_pcwd_write(struct fil
 	return len;
 }
 
-static int usb_pcwd_ioctl(struct inode *inode, struct file *file,
-			  unsigned int cmd, unsigned long arg)
+static long usb_pcwd_ioctl(struct file *file, unsigned int cmd,
+						unsigned long arg)
 {
 	void __user *argp = (void __user *)arg;
 	int __user *p = argp;
@@ -535,7 +535,7 @@ static const struct file_operations usb_
 	.owner =	THIS_MODULE,
 	.llseek =	no_llseek,
 	.write =	usb_pcwd_write,
-	.ioctl =	usb_pcwd_ioctl,
+	.unlocked_ioctl = usb_pcwd_ioctl,
 	.open =		usb_pcwd_open,
 	.release =	usb_pcwd_release,
 };
_