[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: 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>

diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c
index 6d14df3d615dbda640ee6f20db95e762da3af5b1..7dff2b688a9f25a17fbec76dd7e1215f0093076a 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-v4l2.c
+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
@@ -621,27 +621,6 @@ int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
 }
 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
  * @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 ret;
+
        if (vb2_fileio_is_active(q)) {
                dprintk(1, "file io in progress\n");
                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);