diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-11-01 07:25:11 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 14:53:26 -0500 |
commit | f473bf76c71ca734a16f9331ce6b6e9603641888 (patch) | |
tree | 033261b06286aef5dc6cde0aa961d828e2ffae7a /drivers/media/video/uvc/uvc_v4l2.c | |
parent | bef216b7edb0fac356565dea4bd65131bf6f9c4a (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/uvc/uvc_v4l2.c')
-rw-r--r-- | drivers/media/video/uvc/uvc_v4l2.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 758dfefaba8d..8361367806a9 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
@@ -464,8 +464,7 @@ static int uvc_v4l2_release(struct inode *inode, struct file *file) | |||
464 | return 0; | 464 | return 0; |
465 | } | 465 | } |
466 | 466 | ||
467 | static int __uvc_v4l2_do_ioctl(struct file *file, | 467 | static int uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
468 | unsigned int cmd, void *arg) | ||
469 | { | 468 | { |
470 | struct video_device *vdev = video_devdata(file); | 469 | struct video_device *vdev = video_devdata(file); |
471 | struct uvc_video_device *video = video_get_drvdata(vdev); | 470 | struct uvc_video_device *video = video_get_drvdata(vdev); |
@@ -979,7 +978,7 @@ static int __uvc_v4l2_do_ioctl(struct file *file, | |||
979 | 978 | ||
980 | default: | 979 | default: |
981 | if ((ret = v4l_compat_translate_ioctl(file, cmd, arg, | 980 | if ((ret = v4l_compat_translate_ioctl(file, cmd, arg, |
982 | __uvc_v4l2_do_ioctl)) == -ENOIOCTLCMD) | 981 | uvc_v4l2_do_ioctl)) == -ENOIOCTLCMD) |
983 | uvc_trace(UVC_TRACE_IOCTL, "Unknown ioctl 0x%08x\n", | 982 | uvc_trace(UVC_TRACE_IOCTL, "Unknown ioctl 0x%08x\n", |
984 | cmd); | 983 | cmd); |
985 | return ret; | 984 | return ret; |
@@ -988,17 +987,11 @@ static int __uvc_v4l2_do_ioctl(struct file *file, | |||
988 | return ret; | 987 | return ret; |
989 | } | 988 | } |
990 | 989 | ||
991 | static int uvc_v4l2_do_ioctl(struct inode *inode, struct file *file, | ||
992 | unsigned int cmd, void *arg) | ||
993 | { | ||
994 | return __uvc_v4l2_do_ioctl(file, cmd, arg); | ||
995 | } | ||
996 | |||
997 | static int uvc_v4l2_ioctl(struct inode *inode, struct file *file, | 990 | static int uvc_v4l2_ioctl(struct inode *inode, struct file *file, |
998 | unsigned int cmd, unsigned long arg) | 991 | unsigned int cmd, unsigned long arg) |
999 | { | 992 | { |
1000 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_ioctl\n"); | 993 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_ioctl\n"); |
1001 | return video_usercopy(inode, file, cmd, arg, uvc_v4l2_do_ioctl); | 994 | return video_usercopy(file, cmd, arg, uvc_v4l2_do_ioctl); |
1002 | } | 995 | } |
1003 | 996 | ||
1004 | static ssize_t uvc_v4l2_read(struct file *file, char __user *data, | 997 | static ssize_t uvc_v4l2_read(struct file *file, char __user *data, |