diff options
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index a72a361daade..63863fa8d65f 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
@@ -4019,7 +4019,7 @@ out: | |||
4019 | 4019 | ||
4020 | /* File operations */ | 4020 | /* File operations */ |
4021 | 4021 | ||
4022 | static int vino_open(struct inode *inode, struct file *file) | 4022 | static int vino_open(struct file *file) |
4023 | { | 4023 | { |
4024 | struct vino_channel_settings *vcs = video_drvdata(file); | 4024 | struct vino_channel_settings *vcs = video_drvdata(file); |
4025 | int ret = 0; | 4025 | int ret = 0; |
@@ -4050,7 +4050,7 @@ static int vino_open(struct inode *inode, struct file *file) | |||
4050 | return ret; | 4050 | return ret; |
4051 | } | 4051 | } |
4052 | 4052 | ||
4053 | static int vino_close(struct inode *inode, struct file *file) | 4053 | static int vino_close(struct file *file) |
4054 | { | 4054 | { |
4055 | struct vino_channel_settings *vcs = video_drvdata(file); | 4055 | struct vino_channel_settings *vcs = video_drvdata(file); |
4056 | dprintk("close():\n"); | 4056 | dprintk("close():\n"); |
@@ -4343,7 +4343,7 @@ static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
4343 | return 0; | 4343 | return 0; |
4344 | } | 4344 | } |
4345 | 4345 | ||
4346 | static int vino_ioctl(struct inode *inode, struct file *file, | 4346 | static int vino_ioctl(struct file *file, |
4347 | unsigned int cmd, unsigned long arg) | 4347 | unsigned int cmd, unsigned long arg) |
4348 | { | 4348 | { |
4349 | struct vino_channel_settings *vcs = video_drvdata(file); | 4349 | struct vino_channel_settings *vcs = video_drvdata(file); |
@@ -4364,14 +4364,13 @@ static int vino_ioctl(struct inode *inode, struct file *file, | |||
4364 | /* __initdata */ | 4364 | /* __initdata */ |
4365 | static int vino_init_stage; | 4365 | static int vino_init_stage; |
4366 | 4366 | ||
4367 | static const struct file_operations vino_fops = { | 4367 | static const struct v4l2_file_operations vino_fops = { |
4368 | .owner = THIS_MODULE, | 4368 | .owner = THIS_MODULE, |
4369 | .open = vino_open, | 4369 | .open = vino_open, |
4370 | .release = vino_close, | 4370 | .release = vino_close, |
4371 | .ioctl = vino_ioctl, | 4371 | .ioctl = vino_ioctl, |
4372 | .mmap = vino_mmap, | 4372 | .mmap = vino_mmap, |
4373 | .poll = vino_poll, | 4373 | .poll = vino_poll, |
4374 | .llseek = no_llseek, | ||
4375 | }; | 4374 | }; |
4376 | 4375 | ||
4377 | static struct video_device v4l_device_template = { | 4376 | static struct video_device v4l_device_template = { |