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,
         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/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,
         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,
 };