From 8159d727b2a117daf853db864480bb2364c25e4f Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Thu, 3 Jul 2008 23:51:32 -0700
Subject: [PATCH] --- yaml --- r: 107857 b: refs/heads/master c:
 c9488520512df659ad21df5d100b52fed96bdf07 h: refs/heads/master i:   107855:
 d5ac4f4765bca63e91b5ddb35786f83bcf97f81f v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/pcwd_pci.c | 8 +++-----
 trunk/drivers/watchdog/pcwd_usb.c | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9bb5321ba09c..cce5e446a674 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 089ab0791d127e8ada526c4b4d18b7584be8acf0
+refs/heads/master: c9488520512df659ad21df5d100b52fed96bdf07
diff --git a/trunk/drivers/watchdog/pcwd_pci.c b/trunk/drivers/watchdog/pcwd_pci.c
index a1d31d1f750f..67d90810c6e9 100644
--- a/trunk/drivers/watchdog/pcwd_pci.c
+++ b/trunk/drivers/watchdog/pcwd_pci.c
@@ -454,8 +454,8 @@ static ssize_t pcipcwd_write(struct file *file, const char __user *data,
 	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;
@@ -477,9 +477,7 @@ static int pcipcwd_ioctl(struct inode *inode, struct file *file,
 		case WDIOC_GETSTATUS:
 		{
 			int status;
-
 			pcipcwd_get_status(&status);
-
 			return put_user(status, p);
 		}
 
@@ -643,7 +641,7 @@ static const struct file_operations pcipcwd_fops = {
 	.owner =	THIS_MODULE,
 	.llseek =	no_llseek,
 	.write =	pcipcwd_write,
-	.ioctl =	pcipcwd_ioctl,
+	.unlocked_ioctl = pcipcwd_ioctl,
 	.open =		pcipcwd_open,
 	.release =	pcipcwd_release,
 };
diff --git a/trunk/drivers/watchdog/pcwd_usb.c b/trunk/drivers/watchdog/pcwd_usb.c
index 825102a33910..bc399cf65cf7 100644
--- a/trunk/drivers/watchdog/pcwd_usb.c
+++ b/trunk/drivers/watchdog/pcwd_usb.c
@@ -368,8 +368,8 @@ static ssize_t usb_pcwd_write(struct file *file, const char __user *data,
 	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;
@@ -534,7 +534,7 @@ static const struct file_operations usb_pcwd_fops = {
 	.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,
 };