| Message ID | 91a3443e-6723-4e80-a532-8a43ff74cd4f@xs4all.nl (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | media: platform: rpi1-cfe: drop vb2_ops_wait_prepare/finish | expand |
Hi Hans, Thank you for the patch. On Tue, Jan 28, 2025 at 04:03:39PM +0100, 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> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/platform/raspberrypi/rp1-cfe/cfe.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c > index 12660087b12f..ff6f05b28c13 100644 > --- a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c > +++ b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c > @@ -1315,8 +1315,6 @@ static void cfe_stop_streaming(struct vb2_queue *vq) > } > > static const struct vb2_ops cfe_video_qops = { > - .wait_prepare = vb2_ops_wait_prepare, > - .wait_finish = vb2_ops_wait_finish, > .queue_setup = cfe_queue_setup, > .buf_prepare = cfe_buffer_prepare, > .buf_queue = cfe_buffer_queue,
diff --git a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c index 12660087b12f..ff6f05b28c13 100644 --- a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c +++ b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c @@ -1315,8 +1315,6 @@ static void cfe_stop_streaming(struct vb2_queue *vq) } static const struct vb2_ops cfe_video_qops = { - .wait_prepare = vb2_ops_wait_prepare, - .wait_finish = vb2_ops_wait_finish, .queue_setup = cfe_queue_setup, .buf_prepare = cfe_buffer_prepare, .buf_queue = cfe_buffer_queue,
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/platform/raspberrypi/rp1-cfe/cfe.c | 2 -- 1 file changed, 2 deletions(-)