misc: akm8975: move to unlocked_ioctl

Change-Id: Id64fed0b9d7424885eb2186d842779dc4968ccb0

diff --git a/drivers/misc/akm8975.c b/drivers/misc/akm8975.c
index c2c2f12b6d694eec21f8724a10290ef82e4dd94a..7bbb2a548fbcf16c7c6f73c9250f767167c4503d 100644 (file)
--- a/drivers/misc/akm8975.c
+++ b/drivers/misc/akm8975.c
@@ -203,8 +203,8 @@ static int akm_aot_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int akm_aot_ioctl(struct inode *inode, struct file *file,
-             unsigned int cmd, unsigned long arg)
+static long akm_aot_ioctl(struct file *file,
+                         unsigned int cmd, unsigned long arg)
 {
        void __user *argp = (void __user *) arg;
        short flag;
@@ -290,8 +290,8 @@ static int akmd_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int akmd_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-                     unsigned long arg)
+static long akmd_ioctl(struct file *file, unsigned int cmd,
+                      unsigned long arg)
 {
        void __user *argp = (void __user *) arg;
 
@@ -464,14 +464,14 @@ static const struct file_operations akmd_fops = {
        .owner = THIS_MODULE,
        .open = akmd_open,
        .release = akmd_release,
-       .ioctl = akmd_ioctl,
+       .unlocked_ioctl = akmd_ioctl,
 };
 
 static const struct file_operations akm_aot_fops = {
        .owner = THIS_MODULE,
        .open = akm_aot_open,
        .release = akm_aot_release,
-       .ioctl = akm_aot_ioctl,
+       .unlocked_ioctl = akm_aot_ioctl,
 };
 
 static struct miscdevice akm_aot_device = {