media: samples: v4l2-pci-skeleton.c: drop vb2_ops_wait_prepare/finish

Since commit 88785982a1 ("media: vb2: use lock if wait_prepare/finish
are NULL") it is no longer needed to set the wait_prepare/finish
vb2_ops callbacks as long as the lock field in vb2_queue is set.

Since the vb2_ops_wait_prepare/finish callbacks already rely on that field,
we can safely drop these callbacks.

This simplifies the code and this is a step towards the goal of deleting
these callbacks.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Hans Verkuil 2024-10-14 17:06:37 +02:00
parent 3576f817c5
commit d020ca11a8

View File

@ -269,9 +269,7 @@ static void stop_streaming(struct vb2_queue *vq)
} }
/* /*
* The vb2 queue ops. Note that since q->lock is set we can use the standard * The vb2 queue ops.
* vb2_ops_wait_prepare/finish helper functions. If q->lock would be NULL,
* then this driver would have to provide these ops.
*/ */
static const struct vb2_ops skel_qops = { static const struct vb2_ops skel_qops = {
.queue_setup = queue_setup, .queue_setup = queue_setup,
@ -279,8 +277,6 @@ static const struct vb2_ops skel_qops = {
.buf_queue = buffer_queue, .buf_queue = buffer_queue,
.start_streaming = start_streaming, .start_streaming = start_streaming,
.stop_streaming = stop_streaming, .stop_streaming = stop_streaming,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
/* /*