Skip to content

Commit a59f960

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: dsa: lantiq_gswip: 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> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent beb8592 commit a59f960

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

drivers/net/dsa/lantiq_gswip.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,13 +2207,13 @@ static int gswip_probe(struct platform_device *pdev)
22072207
return err;
22082208
}
22092209

2210-
static int gswip_remove(struct platform_device *pdev)
2210+
static void gswip_remove(struct platform_device *pdev)
22112211
{
22122212
struct gswip_priv *priv = platform_get_drvdata(pdev);
22132213
int i;
22142214

22152215
if (!priv)
2216-
return 0;
2216+
return;
22172217

22182218
/* disable the switch */
22192219
gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);
@@ -2228,8 +2228,6 @@ static int gswip_remove(struct platform_device *pdev)
22282228

22292229
for (i = 0; i < priv->num_gphy_fw; i++)
22302230
gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);
2231-
2232-
return 0;
22332231
}
22342232

22352233
static void gswip_shutdown(struct platform_device *pdev)
@@ -2266,7 +2264,7 @@ MODULE_DEVICE_TABLE(of, gswip_of_match);
22662264

22672265
static struct platform_driver gswip_driver = {
22682266
.probe = gswip_probe,
2269-
.remove = gswip_remove,
2267+
.remove_new = gswip_remove,
22702268
.shutdown = gswip_shutdown,
22712269
.driver = {
22722270
.name = "gswip",

0 commit comments

Comments
 (0)