aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vino.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-11-01 07:25:11 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:26 -0500
commitf473bf76c71ca734a16f9331ce6b6e9603641888 (patch)
tree033261b06286aef5dc6cde0aa961d828e2ffae7a /drivers/media/video/vino.c
parentbef216b7edb0fac356565dea4bd65131bf6f9c4a (diff)
V4L/DVB (9503): v4l: remove inode argument from video_usercopy
The inode argument was never used. Removing it from video_usercopy brings the function pointer type of video_usercopy in line with similar v4l2 functions, thus simplifying several drivers. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r--drivers/media/video/vino.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 1efc5f3462c6..a72a361daade 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -4237,8 +4237,7 @@ error:
4237 return ret; 4237 return ret;
4238} 4238}
4239 4239
4240static int vino_do_ioctl(struct inode *inode, struct file *file, 4240static int vino_do_ioctl(struct file *file, unsigned int cmd, void *arg)
4241 unsigned int cmd, void *arg)
4242{ 4241{
4243 struct vino_channel_settings *vcs = video_drvdata(file); 4242 struct vino_channel_settings *vcs = video_drvdata(file);
4244 4243
@@ -4353,7 +4352,7 @@ static int vino_ioctl(struct inode *inode, struct file *file,
4353 if (mutex_lock_interruptible(&vcs->mutex)) 4352 if (mutex_lock_interruptible(&vcs->mutex))
4354 return -EINTR; 4353 return -EINTR;
4355 4354
4356 ret = video_usercopy(inode, file, cmd, arg, vino_do_ioctl); 4355 ret = video_usercopy(file, cmd, arg, vino_do_ioctl);
4357 4356
4358 mutex_unlock(&vcs->mutex); 4357 mutex_unlock(&vcs->mutex);
4359 4358