diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 12:27:20 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 12:27:20 -0200 |
| commit | 04aa4b62d67d07cdb0a26eff8eb37482dea62b42 (patch) | |
| tree | d426e2a49a090939160d3937b9b0700b9a07f5cd /linux/drivers/media/video/v4l2-ioctl.c | |
| parent | bed15b4571693483571303bd2470b79d35bc0ec3 (diff) | |
| download | mediapointer-dvb-s2-04aa4b62d67d07cdb0a26eff8eb37482dea62b42.tar.gz mediapointer-dvb-s2-04aa4b62d67d07cdb0a26eff8eb37482dea62b42.tar.bz2 | |
Get rid of inode parameter at v4l_compat_translate_ioctl()
From: Mauro Carvalho Chehab <mchehab@redhat.com>
The inode parameter at v4l_compat_translate_ioctl() were just passed over several
places just to keep compatible with fops.ioctl. However, it weren't used anywere.
This patch gets hid of this unused parameter.
Priority: normal
CC: Laurent Pinchart <laurent.pinchart@skynet.be>
CC: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-ioctl.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/v4l2-ioctl.c b/linux/drivers/media/video/v4l2-ioctl.c index 871447bdd..301000661 100644 --- a/linux/drivers/media/video/v4l2-ioctl.c +++ b/linux/drivers/media/video/v4l2-ioctl.c @@ -626,7 +626,7 @@ static int check_fmt(const struct v4l2_ioctl_ops *ops, enum v4l2_buf_type type) return -EINVAL; } -static int __video_do_ioctl(struct inode *inode, struct file *file, +static int __video_do_ioctl(struct file *file, unsigned int cmd, void *arg) { struct video_device *vfd = video_devdata(file); @@ -676,7 +676,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, V4L2 ioctls. ********************************************************/ if (_IOC_TYPE(cmd) == 'v' && _IOC_NR(cmd) < BASE_VIDIOCPRIVATE) - return v4l_compat_translate_ioctl(inode, file, cmd, arg, + return v4l_compat_translate_ioctl(file, cmd, arg, __video_do_ioctl); #endif @@ -1833,7 +1833,7 @@ int video_ioctl2(struct inode *inode, struct file *file, } /* Handles IOCTL */ - err = __video_do_ioctl(inode, file, cmd, parg); + err = __video_do_ioctl(file, cmd, parg); if (err == -ENOIOCTLCMD) err = -EINVAL; if (is_ext_ctrl) { |