Skip to content

Commit ab49769

Browse files
hverkuildtor
authored andcommitted
Input: drop vb2_ops_wait_prepare/finish
Since commit 8878598 ("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>
1 parent 08bd5b7 commit ab49769

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

drivers/input/rmi4/rmi_f54.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,6 @@ static const struct vb2_ops rmi_f54_queue_ops = {
372372
.queue_setup = rmi_f54_queue_setup,
373373
.buf_queue = rmi_f54_buffer_queue,
374374
.stop_streaming = rmi_f54_stop_streaming,
375-
.wait_prepare = vb2_ops_wait_prepare,
376-
.wait_finish = vb2_ops_wait_finish,
377375
};
378376

379377
static const struct vb2_queue rmi_f54_queue = {

drivers/input/touchscreen/atmel_mxt_ts.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,8 +2535,6 @@ static void mxt_buffer_queue(struct vb2_buffer *vb)
25352535
static const struct vb2_ops mxt_queue_ops = {
25362536
.queue_setup = mxt_queue_setup,
25372537
.buf_queue = mxt_buffer_queue,
2538-
.wait_prepare = vb2_ops_wait_prepare,
2539-
.wait_finish = vb2_ops_wait_finish,
25402538
};
25412539

25422540
static const struct vb2_queue mxt_queue = {

drivers/input/touchscreen/sur40.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,8 +1108,6 @@ static const struct vb2_ops sur40_queue_ops = {
11081108
.buf_queue = sur40_buffer_queue,
11091109
.start_streaming = sur40_start_streaming,
11101110
.stop_streaming = sur40_stop_streaming,
1111-
.wait_prepare = vb2_ops_wait_prepare,
1112-
.wait_finish = vb2_ops_wait_finish,
11131111
};
11141112

11151113
static const struct vb2_queue sur40_queue = {

0 commit comments

Comments
 (0)