misc: l3g4200d: move to unlocked_ioctl
authorErik Gilling <konkers@android.com>
Tue, 31 Aug 2010 01:17:06 +0000 (18:17 -0700)
committerColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:03:32 +0000 (17:03 -0700)
Change-Id: Icb231ec1ae16c8a99e0840a09d5b32e4c73c5e47

drivers/misc/l3g4200d.c

index cdf0f58e70121c2d14718d2553bdaed44890156f..15f65569060dfb4d4e31ff5405a22497b89ba70b 100644 (file)
@@ -335,7 +335,7 @@ static int l3g4200d_misc_open(struct inode *inode, struct file *file)
        return 0;
 }
 
-static int l3g4200d_misc_ioctl(struct inode *inode, struct file *file,
+static long l3g4200d_misc_ioctl(struct file *file,
                                unsigned int cmd, unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
@@ -388,7 +388,7 @@ static int l3g4200d_misc_ioctl(struct inode *inode, struct file *file,
 static const struct file_operations l3g4200d_misc_fops = {
        .owner = THIS_MODULE,
        .open = l3g4200d_misc_open,
-       .ioctl = l3g4200d_misc_ioctl,
+       .unlocked_ioctl = l3g4200d_misc_ioctl,
 };
 
 static struct miscdevice l3g4200d_misc_device = {