From 3b3708cdf0e7be00dfb4fe4132a3cfcbc509d75e Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Mon, 30 Aug 2010 18:16:46 -0700 Subject: [PATCH] misc: kxtf9: move to unlocked_ioctl Change-Id: Ia881796d95cf93a4f685114a2145810730d3caae --- drivers/misc/kxtf9.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = { -- 2.34.1