Commit 12d6cc19 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jakub Kicinski

net: fec: 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 (mostly) ignored
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.

Trivially convert this driver from always returning zero in the remove
callback to the void returning variant.
Reviewed-by: default avatarMichal Kubiak <michal.kubiak@intel.com>
Reviewed-by: default avatarWei Fang <wei.fang@nxp.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230710071946.3470249-4-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9c3ddc44
...@@ -4458,7 +4458,7 @@ fec_probe(struct platform_device *pdev) ...@@ -4458,7 +4458,7 @@ fec_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int static void
fec_drv_remove(struct platform_device *pdev) fec_drv_remove(struct platform_device *pdev)
{ {
struct net_device *ndev = platform_get_drvdata(pdev); struct net_device *ndev = platform_get_drvdata(pdev);
...@@ -4494,7 +4494,6 @@ fec_drv_remove(struct platform_device *pdev) ...@@ -4494,7 +4494,6 @@ fec_drv_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
free_netdev(ndev); free_netdev(ndev);
return 0;
} }
static int __maybe_unused fec_suspend(struct device *dev) static int __maybe_unused fec_suspend(struct device *dev)
...@@ -4650,7 +4649,7 @@ static struct platform_driver fec_driver = { ...@@ -4650,7 +4649,7 @@ static struct platform_driver fec_driver = {
}, },
.id_table = fec_devtype, .id_table = fec_devtype,
.probe = fec_probe, .probe = fec_probe,
.remove = fec_drv_remove, .remove_new = fec_drv_remove,
}; };
module_platform_driver(fec_driver); module_platform_driver(fec_driver);
......
...@@ -974,7 +974,7 @@ static int mpc52xx_fec_probe(struct platform_device *op) ...@@ -974,7 +974,7 @@ static int mpc52xx_fec_probe(struct platform_device *op)
return rv; return rv;
} }
static int static void
mpc52xx_fec_remove(struct platform_device *op) mpc52xx_fec_remove(struct platform_device *op)
{ {
struct net_device *ndev; struct net_device *ndev;
...@@ -998,8 +998,6 @@ mpc52xx_fec_remove(struct platform_device *op) ...@@ -998,8 +998,6 @@ mpc52xx_fec_remove(struct platform_device *op)
release_mem_region(ndev->base_addr, sizeof(struct mpc52xx_fec)); release_mem_region(ndev->base_addr, sizeof(struct mpc52xx_fec));
free_netdev(ndev); free_netdev(ndev);
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
...@@ -1042,7 +1040,7 @@ static struct platform_driver mpc52xx_fec_driver = { ...@@ -1042,7 +1040,7 @@ static struct platform_driver mpc52xx_fec_driver = {
.of_match_table = mpc52xx_fec_match, .of_match_table = mpc52xx_fec_match,
}, },
.probe = mpc52xx_fec_probe, .probe = mpc52xx_fec_probe,
.remove = mpc52xx_fec_remove, .remove_new = mpc52xx_fec_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = mpc52xx_fec_of_suspend, .suspend = mpc52xx_fec_of_suspend,
.resume = mpc52xx_fec_of_resume, .resume = mpc52xx_fec_of_resume,
......
...@@ -117,7 +117,7 @@ static int mpc52xx_fec_mdio_probe(struct platform_device *of) ...@@ -117,7 +117,7 @@ static int mpc52xx_fec_mdio_probe(struct platform_device *of)
return err; return err;
} }
static int mpc52xx_fec_mdio_remove(struct platform_device *of) static void mpc52xx_fec_mdio_remove(struct platform_device *of)
{ {
struct mii_bus *bus = platform_get_drvdata(of); struct mii_bus *bus = platform_get_drvdata(of);
struct mpc52xx_fec_mdio_priv *priv = bus->priv; struct mpc52xx_fec_mdio_priv *priv = bus->priv;
...@@ -126,8 +126,6 @@ static int mpc52xx_fec_mdio_remove(struct platform_device *of) ...@@ -126,8 +126,6 @@ static int mpc52xx_fec_mdio_remove(struct platform_device *of)
iounmap(priv->regs); iounmap(priv->regs);
kfree(priv); kfree(priv);
mdiobus_free(bus); mdiobus_free(bus);
return 0;
} }
static const struct of_device_id mpc52xx_fec_mdio_match[] = { static const struct of_device_id mpc52xx_fec_mdio_match[] = {
...@@ -145,7 +143,7 @@ struct platform_driver mpc52xx_fec_mdio_driver = { ...@@ -145,7 +143,7 @@ struct platform_driver mpc52xx_fec_mdio_driver = {
.of_match_table = mpc52xx_fec_mdio_match, .of_match_table = mpc52xx_fec_mdio_match,
}, },
.probe = mpc52xx_fec_mdio_probe, .probe = mpc52xx_fec_mdio_probe,
.remove = mpc52xx_fec_mdio_remove, .remove_new = mpc52xx_fec_mdio_remove,
}; };
/* let fec driver call it, since this has to be registered before it */ /* let fec driver call it, since this has to be registered before it */
......
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