From: Erik Gilling <konkers@android.com>
Date: Tue, 31 Aug 2010 01:17:06 +0000 (-0700)
Subject: misc: l3g4200d: move to unlocked_ioctl
X-Git-Tag: firefly_0821_release~9834^2~495
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4aa4cada2ae0553a153b28b6c20157c1ac82cd5;p=firefly-linux-kernel-4.4.55.git

misc: l3g4200d: move to unlocked_ioctl

Change-Id: Icb231ec1ae16c8a99e0840a09d5b32e4c73c5e47
---

diff --git a/drivers/misc/l3g4200d.c b/drivers/misc/l3g4200d.c
index cdf0f58e7012..15f65569060d 100644
--- a/drivers/misc/l3g4200d.c
+++ b/drivers/misc/l3g4200d.c
@@ -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 = {