diff options
Diffstat (limited to 'drivers/media/video/arv.c')
-rw-r--r-- | drivers/media/video/arv.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index 2ba6abd92b6f..d137bac84511 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c | |||
@@ -396,7 +396,7 @@ out_up: | |||
396 | return ret; | 396 | return ret; |
397 | } | 397 | } |
398 | 398 | ||
399 | static int ar_do_ioctl(struct file *file, unsigned int cmd, void *arg) | 399 | static long ar_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
400 | { | 400 | { |
401 | struct video_device *dev = video_devdata(file); | 401 | struct video_device *dev = video_devdata(file); |
402 | struct ar_device *ar = video_get_drvdata(dev); | 402 | struct ar_device *ar = video_get_drvdata(dev); |
@@ -539,7 +539,7 @@ static int ar_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
539 | return 0; | 539 | return 0; |
540 | } | 540 | } |
541 | 541 | ||
542 | static int ar_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 542 | static long ar_ioctl(struct file *file, unsigned int cmd, |
543 | unsigned long arg) | 543 | unsigned long arg) |
544 | { | 544 | { |
545 | return video_usercopy(file, cmd, arg, ar_do_ioctl); | 545 | return video_usercopy(file, cmd, arg, ar_do_ioctl); |
@@ -744,27 +744,23 @@ void ar_release(struct video_device *vfd) | |||
744 | ****************************************************************************/ | 744 | ****************************************************************************/ |
745 | static struct ar_device ardev; | 745 | static struct ar_device ardev; |
746 | 746 | ||
747 | static int ar_exclusive_open(struct inode *inode, struct file *file) | 747 | static int ar_exclusive_open(struct file *file) |
748 | { | 748 | { |
749 | return test_and_set_bit(0, &ardev.in_use) ? -EBUSY : 0; | 749 | return test_and_set_bit(0, &ardev.in_use) ? -EBUSY : 0; |
750 | } | 750 | } |
751 | 751 | ||
752 | static int ar_exclusive_release(struct inode *inode, struct file *file) | 752 | static int ar_exclusive_release(struct file *file) |
753 | { | 753 | { |
754 | clear_bit(0, &ardev.in_use); | 754 | clear_bit(0, &ardev.in_use); |
755 | return 0; | 755 | return 0; |
756 | } | 756 | } |
757 | 757 | ||
758 | static const struct file_operations ar_fops = { | 758 | static const struct v4l2_file_operations ar_fops = { |
759 | .owner = THIS_MODULE, | 759 | .owner = THIS_MODULE, |
760 | .open = ar_exclusive_open, | 760 | .open = ar_exclusive_open, |
761 | .release = ar_exclusive_release, | 761 | .release = ar_exclusive_release, |
762 | .read = ar_read, | 762 | .read = ar_read, |
763 | .ioctl = ar_ioctl, | 763 | .ioctl = ar_ioctl, |
764 | #ifdef CONFIG_COMPAT | ||
765 | .compat_ioctl = v4l_compat_ioctl32, | ||
766 | #endif | ||
767 | .llseek = no_llseek, | ||
768 | }; | 764 | }; |
769 | 765 | ||
770 | static struct video_device ar_template = { | 766 | static struct video_device ar_template = { |