Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d655ca4 authored by Prabhakar Lad's avatar Prabhakar Lad Committed by Mauro Carvalho Chehab
Browse files

[media] media: blackfin: use vb2_ops_wait_prepare/finish helper 



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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 519694f9

drivers/media/platform/blackfin/bfin_capture.c

+3 −14
Original line number Diff line number Diff line
@@ -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,

};
@@ -996,6 +984,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)