summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 12:58:39 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 12:58:39 -0200
commit9bb0976b93978009b15477a0809c54f5e6fe8594 (patch)
tree345994c69b6efa50a71ad0c52fe097e856941304 /linux/drivers/media/video/ivtv
parent04aa4b62d67d07cdb0a26eff8eb37482dea62b42 (diff)
downloadmediapointer-dvb-s2-9bb0976b93978009b15477a0809c54f5e6fe8594.tar.gz
mediapointer-dvb-s2-9bb0976b93978009b15477a0809c54f5e6fe8594.tar.bz2
Remove unused inode parameter from video_ioctl2
From: Mauro Carvalho Chehab <mchehab@redhat.com> 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. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-ioctl.c b/linux/drivers/media/video/ivtv/ivtv-ioctl.c
index 09a75abcb..4bae38d21 100644
--- a/linux/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/linux/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)
vfd->debug = V4L2_DEBUG_IOCTL | V4L2_DEBUG_IOCTL_ARG;
- ret = video_ioctl2_unlocked(filp, cmd, arg);
+ ret = __video_ioctl2(filp, cmd, arg);
vfd->debug = 0;
return ret;
}