From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-yh0-f44.google.com ([209.85.213.44]:35290 "EHLO mail-yh0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751970AbaBNEuf (ORCPT ); Thu, 13 Feb 2014 23:50:35 -0500 Received: by mail-yh0-f44.google.com with SMTP id f73so11193192yha.31 for ; Thu, 13 Feb 2014 20:50:34 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1392284450-41019-8-git-send-email-hverkuil@xs4all.nl> References: <1392284450-41019-1-git-send-email-hverkuil@xs4all.nl> <1392284450-41019-8-git-send-email-hverkuil@xs4all.nl> From: Pawel Osciak Date: Fri, 14 Feb 2014 13:49:54 +0900 Message-ID: Subject: Re: [RFCv3 PATCH 07/10] vb2: rename queued_count to owned_by_drv_count To: Hans Verkuil Cc: LMML , Sylwester Nawrocki , Marek Szyprowski , Hans Verkuil Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-media-owner@vger.kernel.org List-ID: On Thu, Feb 13, 2014 at 6:40 PM, Hans Verkuil wrote: > From: Hans Verkuil > > '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 Acked-by: Pawel Osciak > --- > drivers/media/v4l2-core/videobuf2-core.c | 10 +++++----- > include/media/videobuf2-core.h | 4 ++-- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c > index a3b4b4c..6af76ee 100644 > --- a/drivers/media/v4l2-core/videobuf2-core.c > +++ b/drivers/media/v4l2-core/videobuf2-core.c > @@ -1071,7 +1071,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 */ > @@ -1402,7 +1402,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) > @@ -1554,7 +1554,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); > > @@ -1779,7 +1779,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); > @@ -1911,7 +1911,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 82b7f0f..adaffed 100644 > --- a/include/media/videobuf2-core.h > +++ b/include/media/videobuf2-core.h > @@ -353,7 +353,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 > @@ -385,7 +385,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; > -- > 1.8.4.rc3 > -- Best regards, Pawel Osciak