[WATCHDOG] cpwd.c & riowd.c - unlocked_ioctl

Switch to unlocked_ioctl

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

2 files changed, 17 insertions, 18 deletions

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 084dfe9cecfb..261790afd65b 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -400,8 +400,7 @@ static int cpwd_release(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int cpwd_ioctl(struct inode *inode, struct file *file, 
-                      unsigned int cmd, unsigned long arg)
+static long cpwd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
         static struct watchdog_info info = {
                 .options                = WDIOF_SETTIMEOUT,
@@ -409,6 +408,7 @@ static int cpwd_ioctl(struct inode *inode, struct file *file,
                 .identity               = DRIVER_NAME,
         };
         void __user *argp = (void __user *)arg;
+        struct inode *inode = file->f_path.dentry->d_inode;
         int index = iminor(inode) - WD0_MINOR;
         struct cpwd *p = cpwd_device;
         int setopt = 0;
@@ -481,7 +481,7 @@ static long cpwd_compat_ioctl(struct file *file, unsigned int cmd,
         case WIOCSTOP:
         case WIOCGSTAT:
                 lock_kernel();
-                rval = cpwd_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
+                rval = cpwd_ioctl(file, cmd, arg);
                 unlock_kernel();
                 break;
 
@@ -515,13 +515,13 @@ static ssize_t cpwd_read(struct file * file, char __user *buffer,
 }
 
 static const struct file_operations cpwd_fops = {
-        .owner =        THIS_MODULE,
-        .ioctl =        cpwd_ioctl,
-        .compat_ioctl = cpwd_compat_ioctl,
-        .open =         cpwd_open,
-        .write =        cpwd_write,
-        .read =         cpwd_read,
-        .release =      cpwd_release,
+        .owner =                THIS_MODULE,
+        .unlocked_ioctl =       cpwd_ioctl,
+        .compat_ioctl =         cpwd_compat_ioctl,
+        .open =                 cpwd_open,
+        .write =                cpwd_write,
+        .read =                 cpwd_read,
+        .release =              cpwd_release,
 };
 
 static int __devinit cpwd_probe(struct of_device *op,
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 09cb1833ea27..01cc7e39d92f 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -86,8 +86,7 @@ static int riowd_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
-static int riowd_ioctl(struct inode *inode, struct file *filp,
-                       unsigned int cmd, unsigned long arg)
+static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
         static struct watchdog_info info = {
                 .options                = WDIOF_SETTIMEOUT,
@@ -160,12 +159,12 @@ static ssize_t riowd_write(struct file *file, const char __user *buf, size_t cou
 }
 
 static const struct file_operations riowd_fops = {
-        .owner =        THIS_MODULE,
-        .llseek =       no_llseek,
-        .ioctl =        riowd_ioctl,
-        .open =         riowd_open,
-        .write =        riowd_write,
-        .release =      riowd_release,
+        .owner =                THIS_MODULE,
+        .llseek =               no_llseek,
+        .unlocked_ioctl =       riowd_ioctl,
+        .open =                 riowd_open,
+        .write =                riowd_write,
+        .release =              riowd_release,
 };
 
 static struct miscdevice riowd_miscdev = {