Skip to content

Commit d48a547

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: dsa: realtek: 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 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@pengutronix.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 68ace16 commit d48a547

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

drivers/net/dsa/realtek/realtek-smi.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,12 @@ static int realtek_smi_probe(struct platform_device *pdev)
506506
return 0;
507507
}
508508

509-
static int realtek_smi_remove(struct platform_device *pdev)
509+
static void realtek_smi_remove(struct platform_device *pdev)
510510
{
511511
struct realtek_priv *priv = platform_get_drvdata(pdev);
512512

513513
if (!priv)
514-
return 0;
514+
return;
515515

516516
dsa_unregister_switch(priv->ds);
517517
if (priv->slave_mii_bus)
@@ -520,8 +520,6 @@ static int realtek_smi_remove(struct platform_device *pdev)
520520
/* leave the device reset asserted */
521521
if (priv->reset)
522522
gpiod_set_value(priv->reset, 1);
523-
524-
return 0;
525523
}
526524

527525
static void realtek_smi_shutdown(struct platform_device *pdev)
@@ -559,7 +557,7 @@ static struct platform_driver realtek_smi_driver = {
559557
.of_match_table = realtek_smi_of_match,
560558
},
561559
.probe = realtek_smi_probe,
562-
.remove = realtek_smi_remove,
560+
.remove_new = realtek_smi_remove,
563561
.shutdown = realtek_smi_shutdown,
564562
};
565563
module_platform_driver(realtek_smi_driver);

0 commit comments

Comments
 (0)