summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2024-10-14 17:06:37 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2024-10-28 09:20:10 +0100
commitd020ca11a816a99f87f2d186e137a9fb2341adb3 (patch)
treea6e433e65b77766b72282d71d13c65c3a7c6e3ef /samples
parent3576f817c5ee730a4567aff445f0f853a8adf53a (diff)
media: samples: v4l2-pci-skeleton.c: drop vb2_ops_wait_prepare/finish
Since commit 88785982a19d ("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>
Diffstat (limited to 'samples')
-rw-r--r--samples/v4l/v4l2-pci-skeleton.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c
index 4fc2063b9f59..d709d82800cd 100644
--- a/samples/v4l/v4l2-pci-skeleton.c
+++ b/samples/v4l/v4l2-pci-skeleton.c
@@ -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
- * vb2_ops_wait_prepare/finish helper functions. If q->lock would be NULL,
- * then this driver would have to provide these ops.
+ * The vb2 queue ops.
*/
static const struct vb2_ops skel_qops = {
.queue_setup = queue_setup,
@@ -279,8 +277,6 @@ static const struct vb2_ops skel_qops = {
.buf_queue = buffer_queue,
.start_streaming = start_streaming,
.stop_streaming = stop_streaming,
- .wait_prepare = vb2_ops_wait_prepare,
- .wait_finish = vb2_ops_wait_finish,
};
/*