[PATCH net-next 5/9] net: dsa: mt7530: Convert to platform remove callback returning void

Daniel Golle daniel at makrotopia.org
Tue Sep 19 01:14:23 PDT 2023


On Mon, Sep 18, 2023 at 09:19:12PM +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 ignored (apart
> from emitting a warning) 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. Eventually after all drivers
> are converted, .remove_new() is renamed to .remove().
> 
> 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>

Acked-by: Daniel Golle <daniel at makrotopia.org>

> ---
>  drivers/net/dsa/mt7530-mmio.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/dsa/mt7530-mmio.c b/drivers/net/dsa/mt7530-mmio.c
> index 0a6a2fe34e64..b74a230a3f13 100644
> --- a/drivers/net/dsa/mt7530-mmio.c
> +++ b/drivers/net/dsa/mt7530-mmio.c
> @@ -63,15 +63,12 @@ mt7988_probe(struct platform_device *pdev)
>  	return dsa_register_switch(priv->ds);
>  }
>  
> -static int
> -mt7988_remove(struct platform_device *pdev)
> +static void mt7988_remove(struct platform_device *pdev)
>  {
>  	struct mt7530_priv *priv = platform_get_drvdata(pdev);
>  
>  	if (priv)
>  		mt7530_remove_common(priv);
> -
> -	return 0;
>  }
>  
>  static void mt7988_shutdown(struct platform_device *pdev)
> @@ -88,7 +85,7 @@ static void mt7988_shutdown(struct platform_device *pdev)
>  
>  static struct platform_driver mt7988_platform_driver = {
>  	.probe  = mt7988_probe,
> -	.remove = mt7988_remove,
> +	.remove_new = mt7988_remove,
>  	.shutdown = mt7988_shutdown,
>  	.driver = {
>  		.name = "mt7530-mmio",
> -- 
> 2.40.1
> 
> 



More information about the linux-arm-kernel mailing list