Commit 0367b598 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Marc Kleine-Budde

can: sja1000_isa: 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230512212725.143824-15-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ae08f87a
...@@ -223,7 +223,7 @@ static int sja1000_isa_probe(struct platform_device *pdev) ...@@ -223,7 +223,7 @@ static int sja1000_isa_probe(struct platform_device *pdev)
return err; return err;
} }
static int sja1000_isa_remove(struct platform_device *pdev) static void sja1000_isa_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct sja1000_priv *priv = netdev_priv(dev); struct sja1000_priv *priv = netdev_priv(dev);
...@@ -241,13 +241,11 @@ static int sja1000_isa_remove(struct platform_device *pdev) ...@@ -241,13 +241,11 @@ static int sja1000_isa_remove(struct platform_device *pdev)
release_region(port[idx], SJA1000_IOSIZE); release_region(port[idx], SJA1000_IOSIZE);
} }
free_sja1000dev(dev); free_sja1000dev(dev);
return 0;
} }
static struct platform_driver sja1000_isa_driver = { static struct platform_driver sja1000_isa_driver = {
.probe = sja1000_isa_probe, .probe = sja1000_isa_probe,
.remove = sja1000_isa_remove, .remove_new = sja1000_isa_remove,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
}, },
......
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