From: Hans Verkuil Date: Mon, 14 Oct 2024 15:06:32 +0000 (+0200) Subject: media: video-i2c: drop vb2_ops_wait_prepare/finish X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=361445a26de82d71b940bdfa0c727a1fccedd31b;p=users%2Fjedix%2Flinux-maple.git media: video-i2c: 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 Acked-by: Sakari Ailus --- diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index ffb3d9d61a74..036a6375627a 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,