aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
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/zoran
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/zoran')
-rw-r--r--drivers/media/video/zoran/zoran_driver.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index db11ab9e60da..00b97d97aeaa 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1940,11 +1940,7 @@ zoran_set_input (struct zoran *zr,
1940 * ioctl routine 1940 * ioctl routine
1941 */ 1941 */
1942 1942
1943static int 1943static int zoran_do_ioctl(struct file *file, unsigned int cmd, void *arg)
1944zoran_do_ioctl (struct inode *inode,
1945 struct file *file,
1946 unsigned int cmd,
1947 void *arg)
1948{ 1944{
1949 struct zoran_fh *fh = file->private_data; 1945 struct zoran_fh *fh = file->private_data;
1950 struct zoran *zr = fh->zr; 1946 struct zoran *zr = fh->zr;
@@ -4201,7 +4197,7 @@ zoran_ioctl (struct inode *inode,
4201 unsigned int cmd, 4197 unsigned int cmd,
4202 unsigned long arg) 4198 unsigned long arg)
4203{ 4199{
4204 return video_usercopy(inode, file, cmd, arg, zoran_do_ioctl); 4200 return video_usercopy(file, cmd, arg, zoran_do_ioctl);
4205} 4201}
4206 4202
4207static unsigned int 4203static unsigned int