upstream: [media] vb2: rename queued_count to owned_by_drv_count

'queued_count' is a bit vague since it is not clear to which queue it
refers to: the vb2 internal list of buffers or the driver-owned list
of buffers.

Rename to make it explicit.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 73b718a..98422f1 100644 (file)
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -1077,7 +1077,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
        spin_lock_irqsave(&q->done_lock, flags);
        vb->state = state;
        list_add_tail(&vb->done_entry, &q->done_list);
-       atomic_dec(&q->queued_count);
+       atomic_dec(&q->owned_by_drv_count);
        spin_unlock_irqrestore(&q->done_lock, flags);
 
        /* Inform any processes that may be waiting for buffers */
@@ -1420,7 +1420,7 @@ static void __enqueue_in_driver(struct vb2_buffer *vb)
        unsigned int plane;
 
        vb->state = VB2_BUF_STATE_ACTIVE;
-       atomic_inc(&q->queued_count);
+       atomic_inc(&q->owned_by_drv_count);
 
        /* sync buffers */
        for (plane = 0; plane < vb->num_planes; ++plane)
@@ -1576,7 +1576,7 @@ static int vb2_start_streaming(struct vb2_queue *q)
        int ret;
 
        /* Tell the driver to start streaming */
-       ret = call_qop(q, start_streaming, q, atomic_read(&q->queued_count));
+       ret = call_qop(q, start_streaming, q, atomic_read(&q->owned_by_drv_count));
        if (ret)
                fail_qop(q, start_streaming);
 
@@ -1809,7 +1809,7 @@ int vb2_wait_for_all_buffers(struct vb2_queue *q)
        }
 
        if (!q->retry_start_streaming)
-               wait_event(q->done_wq, !atomic_read(&q->queued_count));
+               wait_event(q->done_wq, !atomic_read(&q->owned_by_drv_count));
        return 0;
 }
 EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffers);
@@ -1941,7 +1941,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
         * has not already dequeued before initiating cancel.
         */
        INIT_LIST_HEAD(&q->done_list);
-       atomic_set(&q->queued_count, 0);
+       atomic_set(&q->owned_by_drv_count, 0);
        wake_up_all(&q->done_wq);
 
        /*

diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 39692c0..438521d 100644 (file)
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -359,7 +359,7 @@ struct v4l2_fh;
  * @bufs:      videobuf buffer structures
  * @num_buffers: number of allocated/used buffers
  * @queued_list: list of buffers currently queued from userspace
- * @queued_count: number of buffers owned by the driver
+ * @owned_by_drv_count: number of buffers owned by the driver
  * @done_list: list of buffers ready to be dequeued to userspace
  * @done_lock: lock to protect done_list list
  * @done_wq:   waitqueue for processes waiting for buffers ready to be dequeued
@@ -394,7 +394,7 @@ struct vb2_queue {
 
        struct list_head                queued_list;
 
-       atomic_t                        queued_count;
+       atomic_t                        owned_by_drv_count;
        struct list_head                done_list;
        spinlock_t                      done_lock;
        wait_queue_head_t               done_wq;