[RESEND PATCH] staging: bcm2835-camera: drop vb2_ops_wait_prepare/finish

Laurent Pinchart laurent.pinchart at ideasonboard.com
Tue Jan 28 07:31:53 PST 2025


Hi Hans,

Thank you for the patch.

On Tue, Jan 28, 2025 at 04:16:27PM +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 at xs4all.nl>

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Note that once we merge a driver for the ISP, this driver will likely be
removed.

> ---
> Resend, adding missing CC to linux-media. No other changes.
> ---
>  drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> index deec33f63bcf..b839b50ac26a 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> @@ -658,8 +658,6 @@ static const struct vb2_ops bcm2835_mmal_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,
>  };
> 
>  /* ------------------------------------------------------------------
> -- 
> 2.45.2
> 

-- 
Regards,

Laurent Pinchart



More information about the linux-rpi-kernel mailing list