mirror of
https://github.com/torvalds/linux.git
synced 2024-10-30 08:42:47 +00:00
[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: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
parent
5256e057f5
commit
dfadf02627
@ -427,7 +427,7 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb,
|
||||
if (V4L2_TYPE_IS_OUTPUT(b->type)) {
|
||||
/*
|
||||
* 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
|
||||
* 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);
|
||||
|
||||
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
|
||||
* @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 ret;
|
||||
|
||||
if (vb2_fileio_is_active(q)) {
|
||||
dprintk(1, "file io in progress\n");
|
||||
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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user