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

Commit d5e90b7a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] uvcvideo: Move to video_ioctl2 



Simplify ioctl handling by using video_ioctl2.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 59b702ea

drivers/media/usb/uvc/uvc_driver.c

+1 −0
Original line number Diff line number Diff line
@@ -1760,6 +1760,7 @@ static int uvc_register_video(struct uvc_device *dev, 
	 */

	vdev->v4l2_dev = &dev->vdev;

	vdev->fops = &uvc_fops;

	vdev->ioctl_ops = &uvc_ioctl_ops;

	vdev->release = uvc_release;

	vdev->prio = &stream->chain->prio;

	if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)

drivers/media/usb/uvc/uvc_v4l2.c

+557 −453

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/usb/uvc/uvcvideo.h

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ struct uvc_driver { 
#define UVC_TRACE_FORMAT	(1 << 3)

#define UVC_TRACE_CAPTURE	(1 << 4)

#define UVC_TRACE_CALLS		(1 << 5)

#define UVC_TRACE_IOCTL		(1 << 6)

#define UVC_TRACE_FRAME		(1 << 7)

#define UVC_TRACE_SUSPEND	(1 << 8)

#define UVC_TRACE_STATUS	(1 << 9)
@@ -654,6 +653,7 @@ static inline int uvc_queue_streaming(struct uvc_video_queue *queue) 
}



/* V4L2 interface */

extern const struct v4l2_ioctl_ops uvc_ioctl_ops;

extern const struct v4l2_file_operations uvc_fops;



/* Media controller */