[PATCH net-next 04/11] net: stmmac: dwmac-visconti: Convert to platform remove callback returning void

Simon Horman simon.horman at corigine.com
Mon Apr 3 08:46:52 PDT 2023


On Sun, Apr 02, 2023 at 04:30:18PM +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>
> ---
>  drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
> index 7531fcd4ffe2..acbb284be174 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
> @@ -257,19 +257,16 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev)
>  	return ret;
>  }
>  
> -static int visconti_eth_dwmac_remove(struct platform_device *pdev)
> +static void visconti_eth_dwmac_remove(struct platform_device *pdev)
>  {
>  	struct net_device *ndev = platform_get_drvdata(pdev);
>  	struct stmmac_priv *priv = netdev_priv(ndev);
> -	int err;

As noted elsewhere, err is returned uninitialised since patch 02/11.
Which will be fixed in v2 :)

[1] https://lore.kernel.org/all/20230403055221.xugl42vub7ugo3tz@pengutronix.de/

That notwithstanding,

Reviewed-by: Simon Horman <simon.horman at corigine.com>

>  	stmmac_pltfr_remove(pdev);
>  
>  	visconti_eth_clock_remove(pdev);
>  
>  	stmmac_remove_config_dt(pdev, priv->plat);
> -
> -	return err;
>  }
>  
>  static const struct of_device_id visconti_eth_dwmac_match[] = {
> @@ -280,7 +277,7 @@ MODULE_DEVICE_TABLE(of, visconti_eth_dwmac_match);
>  
>  static struct platform_driver visconti_eth_dwmac_driver = {
>  	.probe  = visconti_eth_dwmac_probe,
> -	.remove = visconti_eth_dwmac_remove,
> +	.remove_new = visconti_eth_dwmac_remove,
>  	.driver = {
>  		.name           = "visconti-eth-dwmac",
>  		.of_match_table = visconti_eth_dwmac_match,
> -- 
> 2.39.2
> 



More information about the linux-arm-kernel mailing list