Skip to content

Commit 9645751

Browse files
Uwe Kleine-Königbroonie
authored andcommitted
regulator: uniphier: 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() 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> Link: https://msgid.link/r/ced2a73a1aeca3f33d4b194e4dbe2672ad84a50a.1701778038.git.u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 6f382a0 commit 9645751

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/regulator/uniphier-regulator.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static int uniphier_regulator_probe(struct platform_device *pdev)
115115
return ret;
116116
}
117117

118-
static int uniphier_regulator_remove(struct platform_device *pdev)
118+
static void uniphier_regulator_remove(struct platform_device *pdev)
119119
{
120120
struct uniphier_regulator_priv *priv = platform_get_drvdata(pdev);
121121
int i;
@@ -124,8 +124,6 @@ static int uniphier_regulator_remove(struct platform_device *pdev)
124124
reset_control_assert(priv->rst[i]);
125125

126126
clk_bulk_disable_unprepare(priv->data->nclks, priv->clk);
127-
128-
return 0;
129127
}
130128

131129
/* USB3 controller data */
@@ -209,7 +207,7 @@ MODULE_DEVICE_TABLE(of, uniphier_regulator_match);
209207

210208
static struct platform_driver uniphier_regulator_driver = {
211209
.probe = uniphier_regulator_probe,
212-
.remove = uniphier_regulator_remove,
210+
.remove_new = uniphier_regulator_remove,
213211
.driver = {
214212
.name = "uniphier-regulator",
215213
.probe_type = PROBE_PREFER_ASYNCHRONOUS,

0 commit comments

Comments
 (0)