| Message ID | 20230918204227.1316886-29-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 36b80b8353afecec8167d1c440df0f1f0f384d1e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: ethernet: Convert to platform remove callback returning void | expand |
On Mon, Sep 18, 2023 at 10:42:00PM +0200, Uwe Kleine-König wrote: > 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. Acked-by: Gabriel Somlo <gsomlo@gmail.com> Thanks, --G > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/net/ethernet/litex/litex_liteeth.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c > index ffa96059079c..5182fe737c37 100644 > --- a/drivers/net/ethernet/litex/litex_liteeth.c > +++ b/drivers/net/ethernet/litex/litex_liteeth.c > @@ -294,13 +294,11 @@ static int liteeth_probe(struct platform_device *pdev) > return 0; > } > > -static int liteeth_remove(struct platform_device *pdev) > +static void liteeth_remove(struct platform_device *pdev) > { > struct net_device *netdev = platform_get_drvdata(pdev); > > unregister_netdev(netdev); > - > - return 0; > } > > static const struct of_device_id liteeth_of_match[] = { > @@ -311,7 +309,7 @@ MODULE_DEVICE_TABLE(of, liteeth_of_match); > > static struct platform_driver liteeth_driver = { > .probe = liteeth_probe, > - .remove = liteeth_remove, > + .remove_new = liteeth_remove, > .driver = { > .name = DRV_NAME, > .of_match_table = liteeth_of_match, > -- > 2.40.1 >
diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c index ffa96059079c..5182fe737c37 100644 --- a/drivers/net/ethernet/litex/litex_liteeth.c +++ b/drivers/net/ethernet/litex/litex_liteeth.c @@ -294,13 +294,11 @@ static int liteeth_probe(struct platform_device *pdev) return 0; } -static int liteeth_remove(struct platform_device *pdev) +static void liteeth_remove(struct platform_device *pdev) { struct net_device *netdev = platform_get_drvdata(pdev); unregister_netdev(netdev); - - return 0; } static const struct of_device_id liteeth_of_match[] = { @@ -311,7 +309,7 @@ MODULE_DEVICE_TABLE(of, liteeth_of_match); static struct platform_driver liteeth_driver = { .probe = liteeth_probe, - .remove = liteeth_remove, + .remove_new = liteeth_remove, .driver = { .name = DRV_NAME, .of_match_table = liteeth_of_match,
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> --- drivers/net/ethernet/litex/litex_liteeth.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)