public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[media] media: s3c-camif: use vb2_ops_wait_prepare/finish helper

Browse source 
This patch drops driver specific wait_prepare() and
wait_finish() callbacks from vb2_ops and instead uses
the the helpers vb2_ops_wait_prepare/finish() provided
by the vb2 core, the lock member of the queue needs
to be initalized to a mutex so that vb2 helpers
vb2_ops_wait_prepare/finish() can make use of it.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Prabhakar Lad 2014-11-26 19:42:24 -03:00 • committed by Mauro Carvalho Chehab
parent 97bf6af1f9
commit 2914e72681
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/media/platform/s3c-camif/camif-capture.c
View file

@ -536,24 +536,12 @@ static void buffer_queue(struct vb2_buffer *vb)
spin_unlock_irqrestore(&camif->slock, flags); spin_unlock_irqrestore(&camif->slock, flags);
} }
static void camif_lock(struct vb2_queue *vq)
{
struct camif_vp *vp = vb2_get_drv_priv(vq);
mutex_lock(&vp->camif->lock);
}
static void camif_unlock(struct vb2_queue *vq)
{
struct camif_vp *vp = vb2_get_drv_priv(vq);
mutex_unlock(&vp->camif->lock);
}
static const struct vb2_ops s3c_camif_qops = { static const struct vb2_ops s3c_camif_qops = {
.queue_setup = queue_setup, .queue_setup = queue_setup,
.buf_prepare = buffer_prepare, .buf_prepare = buffer_prepare,
.buf_queue = buffer_queue, .buf_queue = buffer_queue,
.wait_prepare = camif_unlock, .wait_prepare = vb2_ops_wait_prepare,
.wait_finish = camif_lock, .wait_finish = vb2_ops_wait_finish,
.start_streaming = start_streaming, .start_streaming = start_streaming,
.stop_streaming = stop_streaming, .stop_streaming = stop_streaming,
}; };
@ -1161,6 +1149,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
q->buf_struct_size = sizeof(struct camif_buffer); q->buf_struct_size = sizeof(struct camif_buffer);
q->drv_priv = vp; q->drv_priv = vp;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->lock = &vp->camif->lock;
ret = vb2_queue_init(q); ret = vb2_queue_init(q);
if (ret) if (ret)