[PATCH 20/53] drm/hisilicon: Convert to platform remove callback returning void

Laurent Pinchart laurent.pinchart at ideasonboard.com
Mon May 8 02:41:18 UTC 2023


Hi Uwe,

Thank you for the patch.

On Sun, May 07, 2023 at 06:25:43PM +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 the hisilicon drm drivers 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>

> ---
>  drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c    | 6 ++----
>  drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 5 ++---
>  2 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
> index d9978b79828c..566de4658719 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c
> @@ -874,14 +874,12 @@ static int dsi_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -static int dsi_remove(struct platform_device *pdev)
> +static void dsi_remove(struct platform_device *pdev)
>  {
>  	struct dsi_data *data = platform_get_drvdata(pdev);
>  	struct dw_dsi *dsi = &data->dsi;
>  
>  	mipi_dsi_host_unregister(&dsi->host);
> -
> -	return 0;
>  }
>  
>  static const struct of_device_id dsi_of_match[] = {
> @@ -892,7 +890,7 @@ MODULE_DEVICE_TABLE(of, dsi_of_match);
>  
>  static struct platform_driver dsi_driver = {
>  	.probe = dsi_probe,
> -	.remove = dsi_remove,
> +	.remove_new = dsi_remove,
>  	.driver = {
>  		.name = "dw-dsi",
>  		.of_match_table = dsi_of_match,
> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> index 9c5d49bf40c9..bc2948500311 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
> @@ -279,10 +279,9 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)
>  	return component_master_add_with_match(dev, &kirin_drm_ops, match);
>  }
>  
> -static int kirin_drm_platform_remove(struct platform_device *pdev)
> +static void kirin_drm_platform_remove(struct platform_device *pdev)
>  {
>  	component_master_del(&pdev->dev, &kirin_drm_ops);
> -	return 0;
>  }
>  
>  static const struct of_device_id kirin_drm_dt_ids[] = {
> @@ -295,7 +294,7 @@ MODULE_DEVICE_TABLE(of, kirin_drm_dt_ids);
>  
>  static struct platform_driver kirin_drm_platform_driver = {
>  	.probe = kirin_drm_platform_probe,
> -	.remove = kirin_drm_platform_remove,
> +	.remove_new = kirin_drm_platform_remove,
>  	.driver = {
>  		.name = "kirin-drm",
>  		.of_match_table = kirin_drm_dt_ids,
> -- 
> 2.39.2
> 

-- 
Regards,

Laurent Pinchart


More information about the dri-devel mailing list