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

misc: kxtf9: move to unlocked_ioctl

Change-Id: Ia881796d95cf93a4f685114a2145810730d3caae
---

diff --git a/drivers/misc/kxtf9.c b/drivers/misc/kxtf9.c
index 17efe994e514..6eaa64abf043 100755
--- a/drivers/misc/kxtf9.c
+++ b/drivers/misc/kxtf9.c
@@ -695,8 +695,8 @@ static int kxtf9_misc_open(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static int kxtf9_misc_ioctl(struct inode *inode, struct file *file,
-				unsigned int cmd, unsigned long arg)
+static long kxtf9_misc_ioctl(struct file *file,
+			     unsigned int cmd, unsigned long arg)
 {
 	void __user *argp = (void __user *)arg;
 	u8 buf[4];
@@ -903,7 +903,7 @@ static int kxtf9_misc_ioctl(struct inode *inode, struct file *file,
 static const struct file_operations kxtf9_misc_fops = {
 	.owner = THIS_MODULE,
 	.open = kxtf9_misc_open,
-	.ioctl = kxtf9_misc_ioctl,
+	.unlocked_ioctl = kxtf9_misc_ioctl,
 };
 
 static struct miscdevice kxtf9_misc_device = {