The patch number 10910 was added via Hans Verkuil <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
videodev2.h: remove deprecated VIDIOC_G_CHIP_IDENT_OLD
As announced VIDIOC_G_CHIP_IDENT_OLD is now removed for 2.6.30.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
---
linux/drivers/media/video/v4l2-compat-ioctl32.c | 1 -
linux/drivers/media/video/v4l2-ioctl.c | 5 -----
linux/include/linux/videodev2.h | 10 ----------
v4l2-apps/test/ioctl-test.c | 2 --
4 files changed, 18 deletions(-)
diff -r 1328d07221c3 -r f650c45e5927
linux/drivers/media/video/v4l2-compat-ioctl32.c
--- a/linux/drivers/media/video/v4l2-compat-ioctl32.c Fri Mar 06 13:29:09
2009 +0100
+++ b/linux/drivers/media/video/v4l2-compat-ioctl32.c Fri Mar 06 13:55:42
2009 +0100
@@ -1052,7 +1052,6 @@ long v4l2_compat_ioctl32(struct file *fi
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 -r 1328d07221c3 -r f650c45e5927 linux/drivers/media/video/v4l2-ioctl.c
--- a/linux/drivers/media/video/v4l2-ioctl.c Fri Mar 06 13:29:09 2009 +0100
+++ b/linux/drivers/media/video/v4l2-ioctl.c Fri Mar 06 13:55:42 2009 +0100
@@ -1706,11 +1706,6 @@ static long __video_do_ioctl(struct 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;
diff -r 1328d07221c3 -r f650c45e5927 linux/include/linux/videodev2.h
--- a/linux/include/linux/videodev2.h Fri Mar 06 13:29:09 2009 +0100
+++ b/linux/include/linux/videodev2.h Fri Mar 06 13:55:42 2009 +0100
@@ -1411,14 +1411,6 @@ struct v4l2_dbg_chip_ident {
__u32 ident; /* chip identifier as specified in
<media/v4l2-chip-ident.h> */
__u32 revision; /* chip revision, chip specific */
} __attribute__ ((packed));
-
-/* VIDIOC_G_CHIP_IDENT_OLD: Deprecated, do not use */
-struct v4l2_chip_ident_old {
- __u32 match_type; /* Match type */
- __u32 match_chip; /* Match this chip, meaning determined by match_type
*/
- __u32 ident; /* chip identifier as specified in
<media/v4l2-chip-ident.h> */
- __u32 revision; /* chip revision, chip specific */
-};
/*
* I O C T L C O D E S F O R V I D E O D E V I C E S
@@ -1497,8 +1489,6 @@ struct v4l2_chip_ident_old {
/* Experimental, meant for debugging, testing and internal use.
Never use this ioctl in applications! */
#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-/* This is deprecated and will go away in 2.6.30 */
-#define VIDIOC_G_CHIP_IDENT_OLD _IOWR('V', 81, struct v4l2_chip_ident_old)
#endif
#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
diff -r 1328d07221c3 -r f650c45e5927 v4l2-apps/test/ioctl-test.c
--- a/v4l2-apps/test/ioctl-test.c Fri Mar 06 13:29:09 2009 +0100
+++ b/v4l2-apps/test/ioctl-test.c Fri Mar 06 13:55:42 2009 +0100
@@ -90,7 +90,6 @@ union v4l_parms {
struct v4l2_encoder_cmd p_v4l2_encoder_cmd;
struct v4l2_dbg_register p_v4l2_dbg_register;
struct v4l2_dbg_chip_ident p_v4l2_dbg_chip_ident;
- struct v4l2_chip_ident_old p_v4l2_chip_ident_old;
struct v4l2_hw_freq_seek p_v4l2_hw_freq_seek;
};
@@ -197,7 +196,6 @@ static const struct {
ioc(VIDIOC_DBG_S_REGISTER), /* struct v4l2_register */
ioc(VIDIOC_DBG_G_REGISTER), /* struct v4l2_register */
ioc(VIDIOC_DBG_G_CHIP_IDENT), /* struct v4l2_dbg_chip_ident */
- ioc(VIDIOC_G_CHIP_IDENT_OLD), /* struct v4l2_chip_ident_old */
ioc(VIDIOC_S_HW_FREQ_SEEK), /* struct v4l2_hw_freq_seek */
#ifdef __OLD_VIDIOC_
ioc(VIDIOC_OVERLAY_OLD), /* int */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/f650c45e5927f2adcd743d0de0a6ba2b5ac5d477
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
