summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/akm8975.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/misc/akm8975.c b/drivers/misc/akm8975.c
index 830d2897afd6..0264bd6c8192 100644
--- a/drivers/misc/akm8975.c
+++ b/drivers/misc/akm8975.c
@@ -222,8 +222,8 @@ static int akm_aot_release(struct inode *inode, struct file *file)
return 0;
}
-static int akm_aot_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long akm_aot_ioctl(struct file *file,
+ unsigned int cmd, unsigned long arg)
{
void __user *argp = (void __user *) arg;
short flag;
@@ -316,8 +316,8 @@ static int akmd_release(struct inode *inode, struct file *file)
return 0;
}
-static int akmd_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg)
+static long akmd_ioctl(struct file *file, unsigned int cmd,
+ unsigned long arg)
{
void __user *argp = (void __user *) arg;
@@ -537,14 +537,14 @@ static const struct file_operations akmd_fops = {
.owner = THIS_MODULE,
.open = akmd_open,
.release = akmd_release,
- .ioctl = akmd_ioctl,
+ .unlocked_ioctl = akmd_ioctl,
};
static const struct file_operations akm_aot_fops = {
.owner = THIS_MODULE,
.open = akm_aot_open,
.release = akm_aot_release,
- .ioctl = akm_aot_ioctl,
+ .unlocked_ioctl = akm_aot_ioctl,
};
static struct miscdevice akm_aot_device = {