diff options
Diffstat (limited to 'drivers/media/video/zr364xx.c')
-rw-r--r-- | drivers/media/video/zr364xx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c index a1d81ed44c7c..bf68ed9c5eb6 100644 --- a/drivers/media/video/zr364xx.c +++ b/drivers/media/video/zr364xx.c | |||
@@ -634,7 +634,7 @@ static int zr364xx_vidioc_streamoff(struct file *file, void *priv, | |||
634 | 634 | ||
635 | 635 | ||
636 | /* open the camera */ | 636 | /* open the camera */ |
637 | static int zr364xx_open(struct inode *inode, struct file *file) | 637 | static int zr364xx_open(struct file *file) |
638 | { | 638 | { |
639 | struct video_device *vdev = video_devdata(file); | 639 | struct video_device *vdev = video_devdata(file); |
640 | struct zr364xx_camera *cam = video_get_drvdata(vdev); | 640 | struct zr364xx_camera *cam = video_get_drvdata(vdev); |
@@ -688,7 +688,7 @@ out: | |||
688 | 688 | ||
689 | 689 | ||
690 | /* release the camera */ | 690 | /* release the camera */ |
691 | static int zr364xx_release(struct inode *inode, struct file *file) | 691 | static int zr364xx_release(struct file *file) |
692 | { | 692 | { |
693 | struct video_device *vdev = video_devdata(file); | 693 | struct video_device *vdev = video_devdata(file); |
694 | struct zr364xx_camera *cam; | 694 | struct zr364xx_camera *cam; |
@@ -761,14 +761,13 @@ static int zr364xx_mmap(struct file *file, struct vm_area_struct *vma) | |||
761 | } | 761 | } |
762 | 762 | ||
763 | 763 | ||
764 | static const struct file_operations zr364xx_fops = { | 764 | static const struct v4l2_file_operations zr364xx_fops = { |
765 | .owner = THIS_MODULE, | 765 | .owner = THIS_MODULE, |
766 | .open = zr364xx_open, | 766 | .open = zr364xx_open, |
767 | .release = zr364xx_release, | 767 | .release = zr364xx_release, |
768 | .read = zr364xx_read, | 768 | .read = zr364xx_read, |
769 | .mmap = zr364xx_mmap, | 769 | .mmap = zr364xx_mmap, |
770 | .ioctl = video_ioctl2, | 770 | .ioctl = video_ioctl2, |
771 | .llseek = no_llseek, | ||
772 | }; | 771 | }; |
773 | 772 | ||
774 | static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = { | 773 | static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = { |