Skip to content

Commit

Permalink
net: dsa: ocelot: Convert to platform remove callback returning void
Browse files Browse the repository at this point in the history
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 these drivers 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>
  • Loading branch information
Uwe Kleine-König authored and David S. Miller committed Sep 20, 2023
1 parent 9764bba commit 68ace16
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
8 changes: 3 additions & 5 deletions drivers/net/dsa/ocelot/ocelot_ext.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,17 @@ static int ocelot_ext_probe(struct platform_device *pdev)
return err;
}

static int ocelot_ext_remove(struct platform_device *pdev)
static void ocelot_ext_remove(struct platform_device *pdev)
{
struct felix *felix = dev_get_drvdata(&pdev->dev);

if (!felix)
return 0;
return;

dsa_unregister_switch(felix->ds);

kfree(felix->ds);
kfree(felix);

return 0;
}

static void ocelot_ext_shutdown(struct platform_device *pdev)
Expand All @@ -154,7 +152,7 @@ static struct platform_driver ocelot_ext_switch_driver = {
.of_match_table = ocelot_ext_switch_of_match,
},
.probe = ocelot_ext_probe,
.remove = ocelot_ext_remove,
.remove_new = ocelot_ext_remove,
.shutdown = ocelot_ext_shutdown,
};
module_platform_driver(ocelot_ext_switch_driver);
Expand Down
8 changes: 3 additions & 5 deletions drivers/net/dsa/ocelot/seville_vsc9953.c
Original file line number Diff line number Diff line change
Expand Up @@ -1029,19 +1029,17 @@ static int seville_probe(struct platform_device *pdev)
return err;
}

static int seville_remove(struct platform_device *pdev)
static void seville_remove(struct platform_device *pdev)
{
struct felix *felix = platform_get_drvdata(pdev);

if (!felix)
return 0;
return;

dsa_unregister_switch(felix->ds);

kfree(felix->ds);
kfree(felix);

return 0;
}

static void seville_shutdown(struct platform_device *pdev)
Expand All @@ -1064,7 +1062,7 @@ MODULE_DEVICE_TABLE(of, seville_of_match);

static struct platform_driver seville_vsc9953_driver = {
.probe = seville_probe,
.remove = seville_remove,
.remove_new = seville_remove,
.shutdown = seville_shutdown,
.driver = {
.name = "mscc_seville",
Expand Down

0 comments on commit 68ace16

Please sign in to comment.