| Message ID | 20231004131254.2673842-22-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EDAC: Convert to platform remove callback returning void | expand |
On 10/4/23 15:12, 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() will be 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/edac/zynqmp_edac.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/edac/zynqmp_edac.c b/drivers/edac/zynqmp_edac.c > index ac7d1e0b324c..2d9a5cfd8931 100644 > --- a/drivers/edac/zynqmp_edac.c > +++ b/drivers/edac/zynqmp_edac.c > @@ -426,7 +426,7 @@ static int edac_probe(struct platform_device *pdev) > return ret; > } > > -static int edac_remove(struct platform_device *pdev) > +static void edac_remove(struct platform_device *pdev) > { > struct edac_device_ctl_info *dci = platform_get_drvdata(pdev); > struct edac_priv *priv = dci->pvt_info; > @@ -440,8 +440,6 @@ static int edac_remove(struct platform_device *pdev) > > edac_device_del_device(&pdev->dev); > edac_device_free_ctl_info(dci); > - > - return 0; > } > > static const struct of_device_id zynqmp_ocm_edac_match[] = { > @@ -457,7 +455,7 @@ static struct platform_driver zynqmp_ocm_edac_driver = { > .of_match_table = zynqmp_ocm_edac_match, > }, > .probe = edac_probe, > - .remove = edac_remove, > + .remove_new = edac_remove, > }; > > module_platform_driver(zynqmp_ocm_edac_driver); Acked-by: Michal Simek <michal.simek@amd.com> Thanks, Michal
diff --git a/drivers/edac/zynqmp_edac.c b/drivers/edac/zynqmp_edac.c index ac7d1e0b324c..2d9a5cfd8931 100644 --- a/drivers/edac/zynqmp_edac.c +++ b/drivers/edac/zynqmp_edac.c @@ -426,7 +426,7 @@ static int edac_probe(struct platform_device *pdev) return ret; } -static int edac_remove(struct platform_device *pdev) +static void edac_remove(struct platform_device *pdev) { struct edac_device_ctl_info *dci = platform_get_drvdata(pdev); struct edac_priv *priv = dci->pvt_info; @@ -440,8 +440,6 @@ static int edac_remove(struct platform_device *pdev) edac_device_del_device(&pdev->dev); edac_device_free_ctl_info(dci); - - return 0; } static const struct of_device_id zynqmp_ocm_edac_match[] = { @@ -457,7 +455,7 @@ static struct platform_driver zynqmp_ocm_edac_driver = { .of_match_table = zynqmp_ocm_edac_match, }, .probe = edac_probe, - .remove = edac_remove, + .remove_new = edac_remove, }; module_platform_driver(zynqmp_ocm_edac_driver);
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() will be 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/edac/zynqmp_edac.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)