| Message ID | 20241014-vb2-wait-v1-5-8c3ee25c618c@xs4all.nl (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | media: start work to remove wait_prepare/finish callbacks | expand |
On Mon, Oct 14, 2024 at 05:06:32PM +0200, Hans Verkuil wrote: > 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> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index ffb3d9d61a749146d0ffc27710689984f3d801ce..036a6375627a95a7ad17a07d883e033324ad471c 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -566,8 +566,6 @@ static const struct vb2_ops video_i2c_video_qops = { .buf_queue = buffer_queue, .start_streaming = start_streaming, .stop_streaming = stop_streaming, - .wait_prepare = vb2_ops_wait_prepare, - .wait_finish = vb2_ops_wait_finish, }; static int video_i2c_querycap(struct file *file, void *priv,
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> --- drivers/media/i2c/video-i2c.c | 2 -- 1 file changed, 2 deletions(-)