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

Commit Message

Uwe Kleine-König May 8, 2023, 2:26 p.m. UTC

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.

Reviewed-by: Simon Horman <[e-mail]>
Signed-off-by: Uwe Kleine-König <[e-mail]>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Nobuhiro Iwamatsu May 9, 2023, 2:28 a.m. UTC | #1

Hi Uwe,

> -----Original Message-----
> From: Uwe Kleine-König <[e-mail]>
> Sent: Monday, May 8, 2023 11:27 PM
> To: Giuseppe Cavallaro <[e-mail]>; Alexandre Torgue
> <[e-mail]>; Jose Abreu <[e-mail]>;
> David S. Miller <[e-mail]>; Eric Dumazet
> <[e-mail]>; Jakub Kicinski <[e-mail]>; Paolo Abeni
> <[e-mail]>; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○
> ＯＳＴ) <[e-mail]>; Maxime Coquelin
> <[e-mail]>
> Cc: [e-mail]; [e-mail];
> [e-mail]; [e-mail]; Simon
> Horman <[e-mail]>
> Subject: [PATCH net-next v2 04/11] net: stmmac: dwmac-visconti: Convert to
> platform remove callback returning void
> 
> 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.
> 
> Reviewed-by: Simon Horman <[e-mail]>
> Signed-off-by: Uwe Kleine-König <[e-mail]>
> ---

Acked-by: Nobuhiro Iwamatsu <[e-mail]>

Best regards,
  Nobuhiro

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
index 56209af6243c..acbb284be174 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
@@ -257,7 +257,7 @@  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);
@@ -267,8 +267,6 @@  static int visconti_eth_dwmac_remove(struct platform_device *pdev)
 	visconti_eth_clock_remove(pdev);
 
 	stmmac_remove_config_dt(pdev, priv->plat);
-
-	return 0;
 }
 
 static const struct of_device_id visconti_eth_dwmac_match[] = {
@@ -279,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,