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

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

[media] vb2: Merge vb2_internal_dqbuf and vb2_dqbuf 



After all the code refactoring, vb2_internal_dqbuf is only called by
vb2_dqbuf.

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 3171cc2b

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

+17 −22
Original line number Original line Diff line number Diff line
@@ -621,27 +621,6 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b) 
}

}

EXPORT_SYMBOL_GPL(vb2_qbuf);

EXPORT_SYMBOL_GPL(vb2_qbuf);





static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b,

		bool nonblocking)

{

	int ret;



	if (b->type != q->type) {

		dprintk(1, "invalid buffer type\n");

		return -EINVAL;

	}



	ret = vb2_core_dqbuf(q, NULL, b, nonblocking);



	/*

	 *  After calling the VIDIOC_DQBUF V4L2_BUF_FLAG_DONE must be

	 *  cleared.

	 */

	b->flags &= ~V4L2_BUF_FLAG_DONE;



	return ret;

}



/**

/**

 * vb2_dqbuf() - Dequeue a buffer to the userspace

 * vb2_dqbuf() - Dequeue a buffer to the userspace

 * @q:		videobuf2 queue

 * @q:		videobuf2 queue
@@ -665,11 +644,27 @@ static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, 
 */

 */

int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)

int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)

{

{

	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_dqbuf(q, b, nonblocking);



	if (b->type != q->type) {

		dprintk(1, "invalid buffer type\n");

		return -EINVAL;

	}



	ret = vb2_core_dqbuf(q, NULL, b, nonblocking);



	/*

	 *  After calling the VIDIOC_DQBUF V4L2_BUF_FLAG_DONE must be

	 *  cleared.

	 */

	b->flags &= ~V4L2_BUF_FLAG_DONE;



	return ret;

}

}

EXPORT_SYMBOL_GPL(vb2_dqbuf);

EXPORT_SYMBOL_GPL(vb2_dqbuf);