media: videobuf2: factor out planes prepare/finish functions

Factor out the code, no functional changes.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 626c4db..1bf58e8 100644 (file)
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -297,6 +297,32 @@ static void __vb2_buf_dmabuf_put(struct vb2_buffer *vb)
 }
 
 /*
+ * __vb2_buf_mem_prepare() - call ->prepare() on buffer's private memory
+ * to sync caches
+ */
+static void __vb2_buf_mem_prepare(struct vb2_buffer *vb)
+{
+       unsigned int plane;
+
+       for (plane = 0; plane < vb->num_planes; ++plane)
+               call_void_memop(vb, prepare, vb->planes[plane].mem_priv);
+       vb->synced = 1;
+}
+
+/*
+ * __vb2_buf_mem_finish() - call ->finish on buffer's private memory
+ * to sync caches
+ */
+static void __vb2_buf_mem_finish(struct vb2_buffer *vb)
+{
+       unsigned int plane;
+
+       for (plane = 0; plane < vb->num_planes; ++plane)
+               call_void_memop(vb, finish, vb->planes[plane].mem_priv);
+       vb->synced = 0;
+}
+
+/*
  * __setup_offsets() - setup unique offsets ("cookies") for every plane in
  * the buffer.
  */
@@ -959,7 +985,6 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
 {
        struct vb2_queue *q = vb->vb2_queue;
        unsigned long flags;
-       unsigned int plane;
 
        if (WARN_ON(vb->state != VB2_BUF_STATE_ACTIVE))
                return;
@@ -979,12 +1004,8 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
        dprintk(4, "done processing on buffer %d, state: %d\n",
                        vb->index, state);
 
-       if (state != VB2_BUF_STATE_QUEUED) {
-               /* sync buffers */
-               for (plane = 0; plane < vb->num_planes; ++plane)
-                       call_void_memop(vb, finish, vb->planes[plane].mem_priv);
-               vb->synced = 0;
-       }
+       if (state != VB2_BUF_STATE_QUEUED)
+               __vb2_buf_mem_finish(vb);
 
        spin_lock_irqsave(&q->done_lock, flags);
        if (state == VB2_BUF_STATE_QUEUED) {
@@ -1309,7 +1330,6 @@ static int __buf_prepare(struct vb2_buffer *vb)
 {
        struct vb2_queue *q = vb->vb2_queue;
        enum vb2_buffer_state orig_state = vb->state;
-       unsigned int plane;
        int ret;
 
        if (q->error) {
@@ -1353,11 +1373,7 @@ static int __buf_prepare(struct vb2_buffer *vb)
                return ret;
        }
 
-       /* sync buffers */
-       for (plane = 0; plane < vb->num_planes; ++plane)
-               call_void_memop(vb, prepare, vb->planes[plane].mem_priv);
-
-       vb->synced = 1;
+       __vb2_buf_mem_prepare(vb);
        vb->prepared = 1;
        vb->state = orig_state;
 
@@ -1977,14 +1993,8 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
                                call_void_vb_qop(vb, buf_request_complete, vb);
                }
 
-               if (vb->synced) {
-                       unsigned int plane;
-
-                       for (plane = 0; plane < vb->num_planes; ++plane)
-                               call_void_memop(vb, finish,
-                                               vb->planes[plane].mem_priv);
-                       vb->synced = 0;
-               }
+               if (vb->synced)
+                       __vb2_buf_mem_finish(vb);
 
                if (vb->prepared) {
                        call_void_vb_qop(vb, buf_finish, vb);