diff options
| author | Prabhakar Lad <prabhakar.csengg@gmail.com> | 2014-10-13 00:40:33 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-28 21:06:18 +0300 |
| commit | 488735bfed9bc17e244d1fc8da4a090dc0af58a9 (patch) | |
| tree | fbeeb03930a67fef26e67e72b2823b3a72ded505 | |
| parent | f92a4e2d96387368e460f74e2c652d4ad34b0906 (diff) | |
| download | linux-488735bfed9bc17e244d1fc8da4a090dc0af58a9.tar.xz | |
[media] media: davinci: vpbe: use vb2_ops_wait_prepare/finish helper functions
this patch makes use of vb2_ops_wait_prepare/finish helper functions.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/platform/davinci/vpbe_display.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index e2bda17f0ffd..6f9599deb355 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -308,20 +308,6 @@ static void vpbe_buf_cleanup(struct vb2_buffer *vb) spin_unlock_irqrestore(&layer->irqlock, flags); } -static void vpbe_wait_prepare(struct vb2_queue *vq) -{ - struct vpbe_layer *layer = vb2_get_drv_priv(vq); - - mutex_unlock(&layer->opslock); -} - -static void vpbe_wait_finish(struct vb2_queue *vq) -{ - struct vpbe_layer *layer = vb2_get_drv_priv(vq); - - mutex_lock(&layer->opslock); -} - static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count) { struct vpbe_layer *layer = vb2_get_drv_priv(vq); @@ -394,8 +380,8 @@ static void vpbe_stop_streaming(struct vb2_queue *vq) static struct vb2_ops video_qops = { .queue_setup = vpbe_buffer_queue_setup, - .wait_prepare = vpbe_wait_prepare, - .wait_finish = vpbe_wait_finish, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, .buf_prepare = vpbe_buffer_prepare, .start_streaming = vpbe_start_streaming, .stop_streaming = vpbe_stop_streaming, @@ -1749,7 +1735,7 @@ static int vpbe_display_probe(struct platform_device *pdev) q->buf_struct_size = sizeof(struct vpbe_disp_buffer); q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->min_buffers_needed = 1; - + q->lock = &disp_dev->dev[i]->opslock; err = vb2_queue_init(q); if (err) { v4l2_err(v4l2_dev, "vb2_queue_init() failed\n"); |