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

Commit dfadf026 authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Mauro Carvalho Chehab
Browse files

[media] vb2: Merge vb2_internal_qbuf and vb2_qbuf 



After all the code refactoring, vb2_internal_qbuf is only called by
vb2_qbuf.

Since the function it is very simple, there is no need to have
two functions.

Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5256e057

drivers/media/v4l2-core/videobuf2-v4l2.c

+5 −9
Original line number Original line Diff line number Diff line
@@ -427,7 +427,7 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, 
	if (V4L2_TYPE_IS_OUTPUT(b->type)) {

	if (V4L2_TYPE_IS_OUTPUT(b->type)) {

		/*

		/*

		 * For output buffers mask out the timecode flag:

		 * For output buffers mask out the timecode flag:

		 * this will be handled later in vb2_internal_qbuf().

		 * this will be handled later in vb2_qbuf().

		 * The 'field' is valid metadata for this output buffer

		 * The 'field' is valid metadata for this output buffer

		 * and so that needs to be copied here.

		 * and so that needs to be copied here.

		 */

		 */
@@ -586,13 +586,6 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) 
}

}

EXPORT_SYMBOL_GPL(vb2_create_bufs);

EXPORT_SYMBOL_GPL(vb2_create_bufs);





static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)

{

	int ret = vb2_queue_or_prepare_buf(q, b, "qbuf");



	return ret ? ret : vb2_core_qbuf(q, b->index, b);

}



/**

/**

 * vb2_qbuf() - Queue a buffer from userspace

 * vb2_qbuf() - Queue a buffer from userspace

 * @q:		videobuf2 queue

 * @q:		videobuf2 queue
@@ -612,12 +605,15 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b) 
 */

 */

int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)

int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)

{

{

	int ret;



	if (vb2_fileio_is_active(q)) {

	if (vb2_fileio_is_active(q)) {

		dprintk(1, "file io in progress\n");

		dprintk(1, "file io in progress\n");

		return -EBUSY;

		return -EBUSY;

	}

	}





	return vb2_internal_qbuf(q, b);

	ret = vb2_queue_or_prepare_buf(q, b, "qbuf");

	return ret ? ret : vb2_core_qbuf(q, b->index, b);

}

}

EXPORT_SYMBOL_GPL(vb2_qbuf);

EXPORT_SYMBOL_GPL(vb2_qbuf);