| Message ID | 0ca3f35bdf9549ccda7c6c10a476f28350d987df.1709587301.git.u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | PM / devfreq: Convert to platform remove callback returning void | expand |
Dne ponedeljek, 04. marec 2024 ob 22:28:43 CET je Uwe Kleine-König napisal(a): > 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> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > --- > drivers/devfreq/sun8i-a33-mbus.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/devfreq/sun8i-a33-mbus.c b/drivers/devfreq/sun8i-a33-mbus.c > index 13d32213139f..bcf654f4ff96 100644 > --- a/drivers/devfreq/sun8i-a33-mbus.c > +++ b/drivers/devfreq/sun8i-a33-mbus.c > @@ -458,7 +458,7 @@ static int sun8i_a33_mbus_probe(struct platform_device *pdev) > return dev_err_probe(dev, ret, err); > } > > -static int sun8i_a33_mbus_remove(struct platform_device *pdev) > +static void sun8i_a33_mbus_remove(struct platform_device *pdev) > { > struct sun8i_a33_mbus *priv = platform_get_drvdata(pdev); > unsigned long initial_freq = priv->profile.initial_freq; > @@ -475,8 +475,6 @@ static int sun8i_a33_mbus_remove(struct platform_device *pdev) > clk_rate_exclusive_put(priv->clk_mbus); > clk_rate_exclusive_put(priv->clk_dram); > clk_disable_unprepare(priv->clk_bus); > - > - return 0; > } > > static const struct sun8i_a33_mbus_variant sun50i_a64_mbus = { > @@ -497,7 +495,7 @@ static SIMPLE_DEV_PM_OPS(sun8i_a33_mbus_pm_ops, > > static struct platform_driver sun8i_a33_mbus_driver = { > .probe = sun8i_a33_mbus_probe, > - .remove = sun8i_a33_mbus_remove, > + .remove_new = sun8i_a33_mbus_remove, > .driver = { > .name = "sun8i-a33-mbus", > .of_match_table = sun8i_a33_mbus_of_match, >
diff --git a/drivers/devfreq/sun8i-a33-mbus.c b/drivers/devfreq/sun8i-a33-mbus.c index 13d32213139f..bcf654f4ff96 100644 --- a/drivers/devfreq/sun8i-a33-mbus.c +++ b/drivers/devfreq/sun8i-a33-mbus.c @@ -458,7 +458,7 @@ static int sun8i_a33_mbus_probe(struct platform_device *pdev) return dev_err_probe(dev, ret, err); } -static int sun8i_a33_mbus_remove(struct platform_device *pdev) +static void sun8i_a33_mbus_remove(struct platform_device *pdev) { struct sun8i_a33_mbus *priv = platform_get_drvdata(pdev); unsigned long initial_freq = priv->profile.initial_freq; @@ -475,8 +475,6 @@ static int sun8i_a33_mbus_remove(struct platform_device *pdev) clk_rate_exclusive_put(priv->clk_mbus); clk_rate_exclusive_put(priv->clk_dram); clk_disable_unprepare(priv->clk_bus); - - return 0; } static const struct sun8i_a33_mbus_variant sun50i_a64_mbus = { @@ -497,7 +495,7 @@ static SIMPLE_DEV_PM_OPS(sun8i_a33_mbus_pm_ops, static struct platform_driver sun8i_a33_mbus_driver = { .probe = sun8i_a33_mbus_probe, - .remove = sun8i_a33_mbus_remove, + .remove_new = sun8i_a33_mbus_remove, .driver = { .name = "sun8i-a33-mbus", .of_match_table = sun8i_a33_mbus_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() 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/devfreq/sun8i-a33-mbus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)