tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <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>

authored by

Hans Verkuil and committed by
Dmitry Torokhov ab497697 08bd5b7c

-6
-2
drivers/input/rmi4/rmi_f54.c
··· 372 372 .queue_setup = rmi_f54_queue_setup, 373 373 .buf_queue = rmi_f54_buffer_queue, 374 374 .stop_streaming = rmi_f54_stop_streaming, 375 - .wait_prepare = vb2_ops_wait_prepare, 376 - .wait_finish = vb2_ops_wait_finish, 377 375 }; 378 376 379 377 static const struct vb2_queue rmi_f54_queue = {
-2
drivers/input/touchscreen/atmel_mxt_ts.c
··· 2535 2535 static const struct vb2_ops mxt_queue_ops = { 2536 2536 .queue_setup = mxt_queue_setup, 2537 2537 .buf_queue = mxt_buffer_queue, 2538 - .wait_prepare = vb2_ops_wait_prepare, 2539 - .wait_finish = vb2_ops_wait_finish, 2540 2538 }; 2541 2539 2542 2540 static const struct vb2_queue mxt_queue = {
-2
drivers/input/touchscreen/sur40.c
··· 1108 1108 .buf_queue = sur40_buffer_queue, 1109 1109 .start_streaming = sur40_start_streaming, 1110 1110 .stop_streaming = sur40_stop_streaming, 1111 - .wait_prepare = vb2_ops_wait_prepare, 1112 - .wait_finish = vb2_ops_wait_finish, 1113 1111 }; 1114 1112 1115 1113 static const struct vb2_queue sur40_queue = {