path: root/drivers/media
diff options
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 11:58:39 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 14:31:49 -0200
commit8a522c916d3c3b29a38bd3c8fc3df826d22a9444 (patch)
treecf7c9752eb6fd9909e6b62dc1c048eed082d4611 /drivers/media
parentb1f88407f3767f924cae1d521e815e568996a4ef (diff)
V4L/DVB (9331): Remove unused inode parameter from video_ioctl2
inode is never used on video_ioctl2. Remove it and rename the function to __video_ioctl2. This allows its usage directly as a callback at fops.unlocked_ioctl. Since we still need a callback with inode to be used with fops.ioctl, this patch adds video_ioctl2() that is just a call to __video_ioctl2(). Also, this patch adds some comments about video_ioctl2 and __video_ioctl2 usage at v4l2-ioctl.h. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 09a75abcb478..4bae38d21ef6 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1830,7 +1830,7 @@ static long ivtv_serialized_ioctl(struct ivtv *itv, struct file *filp,
if (ivtv_debug & IVTV_DBGFLG_IOCTL)
- ret = video_ioctl2_unlocked(filp, cmd, arg);
+ ret = __video_ioctl2(filp, cmd, arg);
vfd->debug = 0;
return ret;
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 5b3e251b9396..710e1a40c422 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -1768,7 +1768,7 @@ static int __video_do_ioctl(struct file *file,
return ret;
-int video_ioctl2(struct inode *inode, struct file *file,
+int __video_ioctl2(struct file *file,
unsigned int cmd, unsigned long arg)
char sbuf[128];
@@ -1860,11 +1860,11 @@ out:
return err;
-long video_ioctl2_unlocked(struct file *file,
- unsigned int cmd, unsigned long arg)
+int video_ioctl2(struct inode *inode, struct file *file,
+ unsigned int cmd, unsigned long arg)
- return video_ioctl2(file->f_path.dentry->d_inode, file, cmd, arg);
+ return __video_ioctl2(file, cmd, arg);

Privacy Policy