[PATCH 23/24] staging: vc04_services: bcm2835-camera: Convert to platform remove callback returning void

Laurent Pinchart laurent.pinchart at ideasonboard.com
Mon Apr 3 19:26:08 PDT 2023


Hi Uwe,

Thank you for the patch.

On Mon, Apr 03, 2023 at 05:40:13PM +0200, Uwe Kleine-König wrote:
> The .remove() callback for a platform driver returns an int which makes
> many driver authors wrongly assume it's possible to do error handling by
> returning an error code. However the value returned is (mostly) ignored
> and this typically results in resource leaks. To improve here there is a
> quest to make the remove callback return void. In the first step of this
> quest all drivers are converted to .remove_new() which already returns
> void.
> 
> Trivially convert this driver from always returning zero in the remove
> callback to the void returning variant.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>

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

> ---
>  .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c   | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> index 4f81765912ea..346d00df815a 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> @@ -1976,7 +1976,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
>  	return ret;
>  }
>  
> -static int bcm2835_mmal_remove(struct platform_device *pdev)
> +static void bcm2835_mmal_remove(struct platform_device *pdev)
>  {
>  	int camera;
>  	struct vchiq_mmal_instance *instance = gdev[0]->instance;
> @@ -1986,13 +1986,11 @@ static int bcm2835_mmal_remove(struct platform_device *pdev)
>  		gdev[camera] = NULL;
>  	}
>  	vchiq_mmal_finalise(instance);
> -
> -	return 0;
>  }
>  
>  static struct platform_driver bcm2835_camera_driver = {
>  	.probe		= bcm2835_mmal_probe,
> -	.remove		= bcm2835_mmal_remove,
> +	.remove_new	= bcm2835_mmal_remove,
>  	.driver		= {
>  		.name	= "bcm2835-camera",
>  	},

-- 
Regards,

Laurent Pinchart



More information about the linux-arm-kernel mailing list