Commit ab497697 authored Jan 28, 2025 by Hans Verkuil Committed by Dmitry Torokhov Feb 04, 2025

Input: drop vb2_ops_wait_prepare/finish



Since commit 88785982 ("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>
Link: https://lore.kernel.org/r/ec811552-6014-43d4-9fcc-2ac729a8b08e@xs4all.nl


Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

parent 08bd5b7c

drivers/input/rmi4/rmi_f54.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -372,8 +372,6 @@ static const struct vb2_ops rmi_f54_queue_ops = {
		.queue_setup = rmi_f54_queue_setup,
		.buf_queue = rmi_f54_buffer_queue,
		.stop_streaming = rmi_f54_stop_streaming,
		.wait_prepare = vb2_ops_wait_prepare,
		.wait_finish = vb2_ops_wait_finish,
		};

		static const struct vb2_queue rmi_f54_queue = {

drivers/input/touchscreen/atmel_mxt_ts.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2535,8 +2535,6 @@ static void mxt_buffer_queue(struct vb2_buffer *vb)
		static const struct vb2_ops mxt_queue_ops = {
		.queue_setup = mxt_queue_setup,
		.buf_queue = mxt_buffer_queue,
		.wait_prepare = vb2_ops_wait_prepare,
		.wait_finish = vb2_ops_wait_finish,
		};

		static const struct vb2_queue mxt_queue = {

drivers/input/touchscreen/sur40.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1108,8 +1108,6 @@ static const struct vb2_ops sur40_queue_ops = {
		.buf_queue = sur40_buffer_queue,
		.start_streaming = sur40_start_streaming,
		.stop_streaming = sur40_stop_streaming,
		.wait_prepare = vb2_ops_wait_prepare,
		.wait_finish = vb2_ops_wait_finish,
		};

		static const struct vb2_queue sur40_queue = {