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/common | |
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/common')
-rw-r--r-- | drivers/media/common/saa7146_fops.c | 2 | ||||
-rw-r--r-- | drivers/media/common/saa7146_video.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 127b0526a727..7d844af88384 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -313,7 +313,7 @@ static int fops_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
313 | /* | 313 | /* |
314 | DEB_EE(("inode:%p, file:%p, cmd:%d, arg:%li\n",inode, file, cmd, arg)); | 314 | DEB_EE(("inode:%p, file:%p, cmd:%d, arg:%li\n",inode, file, cmd, arg)); |
315 | */ | 315 | */ |
316 | return video_usercopy(inode, file, cmd, arg, saa7146_video_do_ioctl); | 316 | return video_usercopy(file, cmd, arg, saa7146_video_do_ioctl); |
317 | } | 317 | } |
318 | 318 | ||
319 | static int fops_mmap(struct file *file, struct vm_area_struct * vma) | 319 | static int fops_mmap(struct file *file, struct vm_area_struct * vma) |
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index fe0bd55977e3..101b01dbb8ea 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -834,7 +834,7 @@ static int video_end(struct saa7146_fh *fh, struct file *file) | |||
834 | * copying is done already, arg is a kernel pointer. | 834 | * copying is done already, arg is a kernel pointer. |
835 | */ | 835 | */ |
836 | 836 | ||
837 | static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) | 837 | int saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
838 | { | 838 | { |
839 | struct saa7146_fh *fh = file->private_data; | 839 | struct saa7146_fh *fh = file->private_data; |
840 | struct saa7146_dev *dev = fh->dev; | 840 | struct saa7146_dev *dev = fh->dev; |
@@ -1216,17 +1216,11 @@ static int __saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *a | |||
1216 | #endif | 1216 | #endif |
1217 | default: | 1217 | default: |
1218 | return v4l_compat_translate_ioctl(file, cmd, arg, | 1218 | return v4l_compat_translate_ioctl(file, cmd, arg, |
1219 | __saa7146_video_do_ioctl); | 1219 | saa7146_video_do_ioctl); |
1220 | } | 1220 | } |
1221 | return 0; | 1221 | return 0; |
1222 | } | 1222 | } |
1223 | 1223 | ||
1224 | int saa7146_video_do_ioctl(struct inode *inode, struct file *file, | ||
1225 | unsigned int cmd, void *arg) | ||
1226 | { | ||
1227 | return __saa7146_video_do_ioctl(file, cmd, arg); | ||
1228 | } | ||
1229 | |||
1230 | /*********************************************************************************/ | 1224 | /*********************************************************************************/ |
1231 | /* buffer handling functions */ | 1225 | /* buffer handling functions */ |
1232 | 1226 | ||