GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 06:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

V4L/DVB (10910): videodev2.h: remove deprecated VIDIOC_G_CHIP_IDENT_OLD

Browse source 
As announced VIDIOC_G_CHIP_IDENT_OLD is now removed for 2.6.30.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2009-03-06 09:55:42 -03:00 • committed by Mauro Carvalho Chehab
parent cf5193c740
commit fbc9fa4e87
3 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/media/video/v4l2-compat-ioctl32.c
View file

@ -1047,7 +1047,6 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
case VIDIOC_DBG_S_REGISTER: case VIDIOC_DBG_S_REGISTER:
case VIDIOC_DBG_G_REGISTER: case VIDIOC_DBG_G_REGISTER:
case VIDIOC_DBG_G_CHIP_IDENT: case VIDIOC_DBG_G_CHIP_IDENT:
case VIDIOC_G_CHIP_IDENT_OLD:
case VIDIOC_S_HW_FREQ_SEEK: case VIDIOC_S_HW_FREQ_SEEK:
ret = do_video_ioctl(file, cmd, arg); ret = do_video_ioctl(file, cmd, arg);
break; break;

5
drivers/media/video/v4l2-ioctl.c
View file

@ -1692,11 +1692,6 @@ static long __video_do_ioctl(struct file *file,
dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision); dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);
break; 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: case VIDIOC_S_HW_FREQ_SEEK:
{ {
struct v4l2_hw_freq_seek *p = arg; struct v4l2_hw_freq_seek *p = arg;

10
include/linux/videodev2.h
View file

@ -1412,14 +1412,6 @@ struct v4l2_dbg_chip_ident {
__u32 revision; /* chip revision, chip specific */ __u32 revision; /* chip revision, chip specific */
} __attribute__ ((packed)); } __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 * 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. /* Experimental, meant for debugging, testing and internal use.
Never use this ioctl in applications! */ Never use this ioctl in applications! */
#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident) #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 #endif
#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek) #define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)