diff options
Diffstat (limited to 'drivers/media/video/usbvideo/vicam.c')
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 4602597ed8d1..53197a4e6b92 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -230,7 +230,7 @@ set_camera_power(struct vicam_camera *cam, int state) | |||
230 | } | 230 | } |
231 | 231 | ||
232 | static int | 232 | static int |
233 | vicam_ioctl(struct inode *inode, struct file *file, unsigned int ioctlnr, unsigned long arg) | 233 | vicam_ioctl(struct file *file, unsigned int ioctlnr, unsigned long arg) |
234 | { | 234 | { |
235 | void __user *user_arg = (void __user *)arg; | 235 | void __user *user_arg = (void __user *)arg; |
236 | struct vicam_camera *cam = file->private_data; | 236 | struct vicam_camera *cam = file->private_data; |
@@ -470,7 +470,7 @@ vicam_ioctl(struct inode *inode, struct file *file, unsigned int ioctlnr, unsign | |||
470 | } | 470 | } |
471 | 471 | ||
472 | static int | 472 | static int |
473 | vicam_open(struct inode *inode, struct file *file) | 473 | vicam_open(struct file *file) |
474 | { | 474 | { |
475 | struct vicam_camera *cam = video_drvdata(file); | 475 | struct vicam_camera *cam = video_drvdata(file); |
476 | 476 | ||
@@ -536,7 +536,7 @@ vicam_open(struct inode *inode, struct file *file) | |||
536 | } | 536 | } |
537 | 537 | ||
538 | static int | 538 | static int |
539 | vicam_close(struct inode *inode, struct file *file) | 539 | vicam_close(struct file *file) |
540 | { | 540 | { |
541 | struct vicam_camera *cam = file->private_data; | 541 | struct vicam_camera *cam = file->private_data; |
542 | int open_count; | 542 | int open_count; |
@@ -783,17 +783,13 @@ vicam_mmap(struct file *file, struct vm_area_struct *vma) | |||
783 | return 0; | 783 | return 0; |
784 | } | 784 | } |
785 | 785 | ||
786 | static const struct file_operations vicam_fops = { | 786 | static const struct v4l2_file_operations vicam_fops = { |
787 | .owner = THIS_MODULE, | 787 | .owner = THIS_MODULE, |
788 | .open = vicam_open, | 788 | .open = vicam_open, |
789 | .release = vicam_close, | 789 | .release = vicam_close, |
790 | .read = vicam_read, | 790 | .read = vicam_read, |
791 | .mmap = vicam_mmap, | 791 | .mmap = vicam_mmap, |
792 | .ioctl = vicam_ioctl, | 792 | .ioctl = vicam_ioctl, |
793 | #ifdef CONFIG_COMPAT | ||
794 | .compat_ioctl = v4l_compat_ioctl32, | ||
795 | #endif | ||
796 | .llseek = no_llseek, | ||
797 | }; | 793 | }; |
798 | 794 | ||
799 | static struct video_device vicam_template = { | 795 | static struct video_device vicam_template = { |