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

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

[media] uvcvideo: Rename uvc_alloc_buffers to uvc_request_buffers 



This brings the function name in line with the V4L2 API terminology.

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

drivers/media/usb/uvc/uvc_queue.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ void uvc_queue_release(struct uvc_video_queue *queue) 
 * V4L2 queue operations

 */



int uvc_alloc_buffers(struct uvc_video_queue *queue,

int uvc_request_buffers(struct uvc_video_queue *queue,

			struct v4l2_requestbuffers *rb)

{

	int ret;

drivers/media/usb/uvc/uvc_v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ static int uvc_ioctl_reqbufs(struct file *file, void *fh, 
		return ret;



	mutex_lock(&stream->mutex);

	ret = uvc_alloc_buffers(&stream->queue, rb);

	ret = uvc_request_buffers(&stream->queue, rb);

	mutex_unlock(&stream->mutex);

	if (ret < 0)

		return ret;

drivers/media/usb/uvc/uvcvideo.h

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ extern struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id); 
extern int uvc_queue_init(struct uvc_video_queue *queue,

		enum v4l2_buf_type type, int drop_corrupted);

extern void uvc_queue_release(struct uvc_video_queue *queue);

extern int uvc_alloc_buffers(struct uvc_video_queue *queue,

extern int uvc_request_buffers(struct uvc_video_queue *queue,

		struct v4l2_requestbuffers *rb);

extern int uvc_query_buffer(struct uvc_video_queue *queue,

		struct v4l2_buffer *v4l2_buf);