From 404f15411be12860151e7a894798578623d37ba5 Mon Sep 17 00:00:00 2001 From: Erik Gilling Date: Mon, 30 Aug 2010 18:17:46 -0700 Subject: [PATCH] misc: max9635: move to unlocked_ioctl Change-Id: Icde61e693cf67c06042f4ea77e6c529d9281e653 --- drivers/misc/max9635.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/misc/max9635.c b/drivers/misc/max9635.c index 2a8b06ca5b21..5acdc1ab4e95 100644 --- a/drivers/misc/max9635.c +++ b/drivers/misc/max9635.c @@ -346,8 +346,8 @@ static int max9635_misc_open(struct inode *inode, struct file *file) return 0; } -static int max9635_misc_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long max9635_misc_ioctl(struct file *file, + unsigned int cmd, unsigned long arg) { void __user *argp = (void __user *)arg; u8 enable; @@ -384,7 +384,7 @@ static int max9635_misc_ioctl(struct inode *inode, struct file *file, static const struct file_operations max9635_misc_fops = { .owner = THIS_MODULE, .open = max9635_misc_open, - .ioctl = max9635_misc_ioctl, + .unlocked_ioctl = max9635_misc_ioctl, }; static struct miscdevice max9635_misc_device = { -- 2.34.1