summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-06 13:55:42 +0100
committerHans Verkuil <hverkuil@xs4all.nl>2009-03-06 13:55:42 +0100
commit6313f620a8d129514b70eafb0f73e93e50fba02a (patch)
treeef395f744b8c3e5a2d9fa8206875f5747d6dff5c /linux/drivers/media
parent2b325438911b426807991cb0cbe94fa3c30d087c (diff)
downloadmediapointer-dvb-s2-6313f620a8d129514b70eafb0f73e93e50fba02a.tar.gz
mediapointer-dvb-s2-6313f620a8d129514b70eafb0f73e93e50fba02a.tar.bz2
videodev2.h: remove deprecated VIDIOC_G_CHIP_IDENT_OLD
From: Hans Verkuil <hverkuil@xs4all.nl> As announced VIDIOC_G_CHIP_IDENT_OLD is now removed for 2.6.30. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/v4l2-compat-ioctl32.c1
-rw-r--r--linux/drivers/media/video/v4l2-ioctl.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/video/v4l2-compat-ioctl32.c b/linux/drivers/media/video/v4l2-compat-ioctl32.c
index 05a356776..d9cee38cd 100644
--- a/linux/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c
@@ -1052,7 +1052,6 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
case VIDIOC_DBG_S_REGISTER:
case VIDIOC_DBG_G_REGISTER:
case VIDIOC_DBG_G_CHIP_IDENT:
- case VIDIOC_G_CHIP_IDENT_OLD:
case VIDIOC_S_HW_FREQ_SEEK:
ret = do_video_ioctl(file, cmd, arg);
break;
diff --git a/linux/drivers/media/video/v4l2-ioctl.c b/linux/drivers/media/video/v4l2-ioctl.c
index e079a343a..fa7d49482 100644
--- a/linux/drivers/media/video/v4l2-ioctl.c
+++ b/linux/drivers/media/video/v4l2-ioctl.c
@@ -1706,11 +1706,6 @@ static long __video_do_ioctl(struct file *file,
dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);
break;
}
- case VIDIOC_G_CHIP_IDENT_OLD:
- printk(KERN_ERR "VIDIOC_G_CHIP_IDENT has been deprecated and will disappear in 2.6.30.\n");
- printk(KERN_ERR "It is a debugging ioctl and must not be used in applications!\n");
- return -EINVAL;
-
case VIDIOC_S_HW_FREQ_SEEK:
{
struct v4l2_hw_freq_seek *p = arg;