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>,
Kyungmin Park <kyungmin.park@samsung.com>,
Tomasz Stanislawski <t.stanislaws@samsung.com>
Subject: [PATCH 07/12] media: s5p-tv: use vb2_ops_wait_prepare/finish helper
Date: Tue, 18 Nov 2014 11:23:36 +0000 [thread overview]
Message-ID: <1416309821-5426-8-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: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Tomasz Stanislawski <t.stanislaws@samsung.com>
---
drivers/media/platform/s5p-tv/mixer_video.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index b4d2696..72d4f2e 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -926,22 +926,6 @@ static void buf_queue(struct vb2_buffer *vb)
mxr_dbg(mdev, "queuing buffer\n");
}
-static void wait_lock(struct vb2_queue *vq)
-{
- struct mxr_layer *layer = vb2_get_drv_priv(vq);
-
- mxr_dbg(layer->mdev, "%s\n", __func__);
- mutex_lock(&layer->mutex);
-}
-
-static void wait_unlock(struct vb2_queue *vq)
-{
- struct mxr_layer *layer = vb2_get_drv_priv(vq);
-
- mxr_dbg(layer->mdev, "%s\n", __func__);
- mutex_unlock(&layer->mutex);
-}
-
static int start_streaming(struct vb2_queue *vq, unsigned int count)
{
struct mxr_layer *layer = vb2_get_drv_priv(vq);
@@ -1040,8 +1024,8 @@ static void stop_streaming(struct vb2_queue *vq)
static struct vb2_ops mxr_video_qops = {
.queue_setup = queue_setup,
.buf_queue = buf_queue,
- .wait_prepare = wait_unlock,
- .wait_finish = wait_lock,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
.start_streaming = start_streaming,
.stop_streaming = stop_streaming,
};
@@ -1122,6 +1106,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
.ops = &mxr_video_qops,
.min_buffers_needed = 1,
.mem_ops = &vb2_dma_contig_memops,
+ .lock = &layer->mutex,
};
return layer;
--
1.9.1
next prev parent reply other threads:[~2014-11-18 11:26 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 ` Lad, Prabhakar [this message]
2014-11-18 11:23 ` [PATCH 08/12] media: blackfin: " Lad, Prabhakar
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-8-git-send-email-prabhakar.csengg@gmail.com \
--to=prabhakar.csengg@gmail.com \
--cc=hans.verkuil@cisco.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=t.stanislaws@samsung.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®