diff options
| author | Erik Gilling <konkers@android.com> | 2010-08-30 18:15:22 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2010-10-19 13:35:01 -0700 |
| commit | 760138ecbcbeb79d5618075a460352a32f8f65aa (patch) | |
| tree | de9128889f61ccf7515f9e974574132d2478b312 /drivers/misc | |
| parent | af2ad243bd36cc46adcde5cd23440d92ea69f7a6 (diff) | |
misc: akm8975: move to unlocked_ioctl
Change-Id: Id64fed0b9d7424885eb2186d842779dc4968ccb0
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/akm8975.c | 12 |
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 = { |