Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbc9fa4e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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



As announced VIDIOC_G_CHIP_IDENT_OLD is now removed for 2.6.30.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cf5193c7

drivers/media/video/v4l2-compat-ioctl32.c

+0 −1
Original line number Diff line number Diff line
@@ -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_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;

drivers/media/video/v4l2-ioctl.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

		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;

include/linux/videodev2.h

+0 −10
Original line number Diff line number Diff line
@@ -1412,14 +1412,6 @@ struct v4l2_dbg_chip_ident { 
	__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)