[WATCHDOG 08/57] davinci_wdt: unlocked_ioctl and check locking

Review and switch to unlocked_ioctl

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 1782c79eff06..926b59c41186 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -22,10 +22,10 @@
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
 
 #include <asm/hardware.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
 
 #define MODULE_NAME "DAVINCI-WDT: "
 
@@ -143,9 +143,8 @@ static struct watchdog_info ident = {
         .identity = "DaVinci Watchdog",
 };
 
-static int
-davinci_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                  unsigned long arg)
+static long davinci_wdt_ioctl(struct file *file,
+                                        unsigned int cmd, unsigned long arg)
 {
         int ret = -ENOTTY;
 
@@ -184,7 +183,7 @@ static const struct file_operations davinci_wdt_fops = {
         .owner = THIS_MODULE,
         .llseek = no_llseek,
         .write = davinci_wdt_write,
-        .ioctl = davinci_wdt_ioctl,
+        .unlocked_ioctl = davinci_wdt_ioctl,
         .open = davinci_wdt_open,
         .release = davinci_wdt_release,
 };