Those ioctls are deprecated, list them in the features removal schedule for 2.6.39. Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> --- Documentation/feature-removal-schedule.txt | 23 +++++++++++++++++++++++ drivers/media/video/uvc/uvc_v4l2.c | 14 ++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index f2742e1..0251dff 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -566,3 +566,26 @@ Why: This field is deprecated. I2C device drivers shouldn't change their Who: Jean Delvare <khali@xxxxxxxxxxxx> ---------------------------- + +What: Support for UVCIOC_CTRL_ADD in the uvcvideo driver +When: 2.6.39 +Why: The information passed to the driver by this ioctl is now queried + dynamically from the device. +Who: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> + +---------------------------- + +What: Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver +When: 2.6.39 +Why: Used only by applications compiled against older driver versions. + Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls. +Who: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> + +---------------------------- + +What: Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver +When: 2.6.39 +Why: Superseded by the UVCIOC_CTRL_QUERY ioctl. +Who: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> + +---------------------------- diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 7432336..c03046a 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c @@ -1020,10 +1020,20 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) /* Dynamic controls. */ case UVCIOC_CTRL_ADD: + uvc_printk(KERN_INFO, "Deprecated UVCIOC_CTRL_ADD ioctl " + "will be removed in 2.6.39.\n"); + uvc_printk(KERN_INFO, "See http://www.ideasonboard.org/uvc/ " + "for upgrade instructions.\n"); + /* Legacy ioctl, kept for API compatibility reasons */ return -EEXIST; case UVCIOC_CTRL_MAP_OLD: + uvc_printk(KERN_INFO, "Deprecated UVCIOC_CTRL_MAP_OLD ioctl " + "will be removed in 2.6.39.\n"); + uvc_printk(KERN_INFO, "See http://www.ideasonboard.org/uvc/"; + "for upgrade instructions.\n"); + case UVCIOC_CTRL_MAP: return uvc_ioctl_ctrl_map(chain, arg, cmd == UVCIOC_CTRL_MAP_OLD); @@ -1041,6 +1051,10 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) .data = xctrl->data, }; + uvc_printk(KERN_INFO, "Deprecated UVCIOC_CTRL_[GS]ET ioctls " + "will be removed in 2.6.39.\n"); + uvc_printk(KERN_INFO, "See http://www.ideasonboard.org/uvc/ " + "for upgrade instructions.\n"); return uvc_xu_ctrl_query(chain, &xqry); } -- 1.7.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
