diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2024-10-14 17:06:35 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2024-10-28 09:20:07 +0100 |
| commit | 7a9c25d52ef32da14b171f8c3646a8240ea44464 (patch) | |
| tree | 142e4217c2e26dc730c6afc1e791f0192c01f139 | |
| parent | 4bf194e10e42aa0759eb5cc0173b76d3523654b4 (diff) | |
| download | linux-stable-7a9c25d52ef32da14b171f8c3646a8240ea44464.tar.gz linux-stable-7a9c25d52ef32da14b171f8c3646a8240ea44464.tar.bz2 linux-stable-7a9c25d52ef32da14b171f8c3646a8240ea44464.zip | |
media: common: saa7146: 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>
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_vbi.c | 2 | ||||
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_video.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/common/saa7146/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c index bb7d81f7eba6..a1854b3dd004 100644 --- a/drivers/media/common/saa7146/saa7146_vbi.c +++ b/drivers/media/common/saa7146/saa7146_vbi.c @@ -407,8 +407,6 @@ const struct vb2_ops vbi_qops = { .buf_cleanup = buf_cleanup, .start_streaming = start_streaming, .stop_streaming = stop_streaming, - .wait_prepare = vb2_ops_wait_prepare, - .wait_finish = vb2_ops_wait_finish, }; /* ------------------------------------------------------------------ */ diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c index 040489e15ea0..94e1cd4eaedb 100644 --- a/drivers/media/common/saa7146/saa7146_video.c +++ b/drivers/media/common/saa7146/saa7146_video.c @@ -681,8 +681,6 @@ const struct vb2_ops video_qops = { .buf_cleanup = buf_cleanup, .start_streaming = start_streaming, .stop_streaming = stop_streaming, - .wait_prepare = vb2_ops_wait_prepare, - .wait_finish = vb2_ops_wait_finish, }; /********************************************************************************/ |