Skip to contentSkip to conversation

input: drop vb2_ops_wait_prepare/finish

PATCH Applied Hans Verkuil 2 participants 2 messages Jan 28, 2025 – Feb 6, 2025

Subsystems (4)
Media (V4L/DVB) HID Input drivers Atmel maxtouch driver
lore
Share & tools
lore

Hans Verkuil

author
#0 lore raw

PATCH 1/1 input: 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 <[email protected]>
---
 drivers/input/rmi4/rmi_f54.c             | 2 --
 drivers/input/touchscreen/atmel_mxt_ts.c | 2 --
 drivers/input/touchscreen/sur40.c        | 2 --
 3 files changed, 6 deletions(-)
drivers/input/rmi4/rmi_f54.c +0 -2
index 5c3da910b5b2..ac4041a69fcd 100644
@@ -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
index 3ddabc5a2c99..322d5a3d40a0 100644
@@ -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
index 8365a2ac6fce..7b3b10cbfcfc 100644
@@ -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 = {
Signature · 1 line
2.45.2
maintainer Applied
#1 lore raw
Quoted 11 lines · Hans Verkuil

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 <[email protected]>

Applied, thank you.

Signature · 1 line
Dmitry