mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
To: Hans Verkuil <hans.verkuil@cisco.com>,
	Mauro Carvalho Chehab <m.chehab@samsung.com>,
	LMML <linux-media@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	"Lad, Prabhakar" <prabhakar.csengg@gmail.com>,
	Scott Jiang <scott.jiang.linux@gmail.com>
Subject: [PATCH 08/12] media: blackfin: use vb2_ops_wait_prepare/finish helper
Date: Tue, 18 Nov 2014 11:23:37 +0000	[thread overview]
Message-ID: <1416309821-5426-9-git-send-email-prabhakar.csengg@gmail.com> (raw)
In-Reply-To: <1416309821-5426-1-git-send-email-prabhakar.csengg@gmail.com>

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Scott Jiang <scott.jiang.linux@gmail.com> 
---
 drivers/media/platform/blackfin/bfin_capture.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index b3345b3..819ec0e 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -349,18 +349,6 @@ static void bcap_buffer_cleanup(struct vb2_buffer *vb)
 	spin_unlock_irqrestore(&bcap_dev->lock, flags);
 }
 
-static void bcap_lock(struct vb2_queue *vq)
-{
-	struct bcap_device *bcap_dev = vb2_get_drv_priv(vq);
-	mutex_lock(&bcap_dev->mutex);
-}
-
-static void bcap_unlock(struct vb2_queue *vq)
-{
-	struct bcap_device *bcap_dev = vb2_get_drv_priv(vq);
-	mutex_unlock(&bcap_dev->mutex);
-}
-
 static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count)
 {
 	struct bcap_device *bcap_dev = vb2_get_drv_priv(vq);
@@ -457,8 +445,8 @@ static struct vb2_ops bcap_video_qops = {
 	.buf_prepare            = bcap_buffer_prepare,
 	.buf_cleanup            = bcap_buffer_cleanup,
 	.buf_queue              = bcap_buffer_queue,
-	.wait_prepare           = bcap_unlock,
-	.wait_finish            = bcap_lock,
+	.wait_prepare           = vb2_ops_wait_prepare,
+	.wait_finish            = vb2_ops_wait_finish,
 	.start_streaming        = bcap_start_streaming,
 	.stop_streaming         = bcap_stop_streaming,
 };
@@ -995,6 +983,7 @@ static int bcap_probe(struct platform_device *pdev)
 	q->ops = &bcap_video_qops;
 	q->mem_ops = &vb2_dma_contig_memops;
 	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+	q->lock = &bcap_dev->mutex;
 
 	ret = vb2_queue_init(q);
 	if (ret)
-- 
1.9.1


  parent reply	other threads:[~2014-11-18 11:25 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-18 11:23 [PATCH 00/12] media: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 01/12] media: s3c-camif: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 02/12] media: ti-vpe: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 03/12] media: exynos-gsc: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 04/12] media: soc_camera: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 05/12] media: sh_veu: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 06/12] media: marvell-ccic: " Lad, Prabhakar
2014-11-18 13:03   ` Jonathan Corbet
2014-11-18 13:23     ` Prabhakar Lad
2014-11-18 14:31       ` Jonathan Corbet
2014-11-18 11:23 ` [PATCH 07/12] media: s5p-tv: " Lad, Prabhakar
2014-11-18 11:23 ` Lad, Prabhakar [this message]
2014-11-18 11:23 ` [PATCH 09/12] media: s5p-mfc: " Lad, Prabhakar
2014-11-25 11:24   ` Kamil Debski
2014-11-18 11:23 ` [PATCH 10/12] media: vivid: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 11/12] media: davinci: vpif_capture: " Lad, Prabhakar
2014-11-18 11:23 ` [PATCH 12/12] media: usb: uvc: " Lad, Prabhakar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1416309821-5426-9-git-send-email-prabhakar.csengg@gmail.com \
    --to=prabhakar.csengg@gmail.com \
    --cc=hans.verkuil@cisco.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=m.chehab@samsung.com \
    --cc=scott.jiang.linux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®