Commit c306171d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by David S. Miller

net: dsa: b53: 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 these drivers from always returning zero in the remove
callback to the void returning variant.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f0b985d
...@@ -324,14 +324,12 @@ static int b53_mmap_probe(struct platform_device *pdev) ...@@ -324,14 +324,12 @@ static int b53_mmap_probe(struct platform_device *pdev)
return b53_switch_register(dev); return b53_switch_register(dev);
} }
static int b53_mmap_remove(struct platform_device *pdev) static void b53_mmap_remove(struct platform_device *pdev)
{ {
struct b53_device *dev = platform_get_drvdata(pdev); struct b53_device *dev = platform_get_drvdata(pdev);
if (dev) if (dev)
b53_switch_remove(dev); b53_switch_remove(dev);
return 0;
} }
static void b53_mmap_shutdown(struct platform_device *pdev) static void b53_mmap_shutdown(struct platform_device *pdev)
...@@ -372,7 +370,7 @@ MODULE_DEVICE_TABLE(of, b53_mmap_of_table); ...@@ -372,7 +370,7 @@ MODULE_DEVICE_TABLE(of, b53_mmap_of_table);
static struct platform_driver b53_mmap_driver = { static struct platform_driver b53_mmap_driver = {
.probe = b53_mmap_probe, .probe = b53_mmap_probe,
.remove = b53_mmap_remove, .remove_new = b53_mmap_remove,
.shutdown = b53_mmap_shutdown, .shutdown = b53_mmap_shutdown,
.driver = { .driver = {
.name = "b53-switch", .name = "b53-switch",
......
...@@ -657,17 +657,15 @@ static int b53_srab_probe(struct platform_device *pdev) ...@@ -657,17 +657,15 @@ static int b53_srab_probe(struct platform_device *pdev)
return b53_switch_register(dev); return b53_switch_register(dev);
} }
static int b53_srab_remove(struct platform_device *pdev) static void b53_srab_remove(struct platform_device *pdev)
{ {
struct b53_device *dev = platform_get_drvdata(pdev); struct b53_device *dev = platform_get_drvdata(pdev);
if (!dev) if (!dev)
return 0; return;
b53_srab_intr_set(dev->priv, false); b53_srab_intr_set(dev->priv, false);
b53_switch_remove(dev); b53_switch_remove(dev);
return 0;
} }
static void b53_srab_shutdown(struct platform_device *pdev) static void b53_srab_shutdown(struct platform_device *pdev)
...@@ -684,7 +682,7 @@ static void b53_srab_shutdown(struct platform_device *pdev) ...@@ -684,7 +682,7 @@ static void b53_srab_shutdown(struct platform_device *pdev)
static struct platform_driver b53_srab_driver = { static struct platform_driver b53_srab_driver = {
.probe = b53_srab_probe, .probe = b53_srab_probe,
.remove = b53_srab_remove, .remove_new = b53_srab_remove,
.shutdown = b53_srab_shutdown, .shutdown = b53_srab_shutdown,
.driver = { .driver = {
.name = "b53-srab-switch", .name = "b53-srab-switch",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment