Commit 999ba69b authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab

[media] media: davinci: vpif_capture: use vb2_ops_wait_prepare/finish helper functions

this patch makes use of vb2_ops_wait_prepare/finish helper functions.
Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 37665248
...@@ -224,24 +224,6 @@ static void vpif_buf_cleanup(struct vb2_buffer *vb) ...@@ -224,24 +224,6 @@ static void vpif_buf_cleanup(struct vb2_buffer *vb)
} }
static void vpif_wait_prepare(struct vb2_queue *vq)
{
struct channel_obj *ch = vb2_get_drv_priv(vq);
struct common_obj *common;
common = &ch->common[VPIF_VIDEO_INDEX];
mutex_unlock(&common->lock);
}
static void vpif_wait_finish(struct vb2_queue *vq)
{
struct channel_obj *ch = vb2_get_drv_priv(vq);
struct common_obj *common;
common = &ch->common[VPIF_VIDEO_INDEX];
mutex_lock(&common->lock);
}
static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count) static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
{ {
struct vpif_capture_config *vpif_config_data = struct vpif_capture_config *vpif_config_data =
...@@ -374,8 +356,6 @@ static void vpif_stop_streaming(struct vb2_queue *vq) ...@@ -374,8 +356,6 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
static struct vb2_ops video_qops = { static struct vb2_ops video_qops = {
.queue_setup = vpif_buffer_queue_setup, .queue_setup = vpif_buffer_queue_setup,
.wait_prepare = vpif_wait_prepare,
.wait_finish = vpif_wait_finish,
.buf_prepare = vpif_buffer_prepare, .buf_prepare = vpif_buffer_prepare,
.start_streaming = vpif_start_streaming, .start_streaming = vpif_start_streaming,
.stop_streaming = vpif_stop_streaming, .stop_streaming = vpif_stop_streaming,
...@@ -1977,6 +1957,7 @@ static int vpif_probe_complete(void) ...@@ -1977,6 +1957,7 @@ static int vpif_probe_complete(void)
q->buf_struct_size = sizeof(struct vpif_cap_buffer); q->buf_struct_size = sizeof(struct vpif_cap_buffer);
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->min_buffers_needed = 1; q->min_buffers_needed = 1;
q->lock = &common->lock;
err = vb2_queue_init(q); err = vb2_queue_init(q);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment