Skip to content

Commit b3438f5

Browse files
Uwe Kleine-Königbebarino
authored andcommitted
clk: axs10x: 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. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20230312161512.2715500-5-u.kleine-koenig@pengutronix.de Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent b46d59c commit b3438f5

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

drivers/clk/axs10x/i2s_pll_clock.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,9 @@ static int i2s_pll_clk_probe(struct platform_device *pdev)
198198
return of_clk_add_provider(node, of_clk_src_simple_get, clk);
199199
}
200200

201-
static int i2s_pll_clk_remove(struct platform_device *pdev)
201+
static void i2s_pll_clk_remove(struct platform_device *pdev)
202202
{
203203
of_clk_del_provider(pdev->dev.of_node);
204-
return 0;
205204
}
206205

207206
static const struct of_device_id i2s_pll_clk_id[] = {
@@ -216,7 +215,7 @@ static struct platform_driver i2s_pll_clk_driver = {
216215
.of_match_table = i2s_pll_clk_id,
217216
},
218217
.probe = i2s_pll_clk_probe,
219-
.remove = i2s_pll_clk_remove,
218+
.remove_new = i2s_pll_clk_remove,
220219
};
221220
module_platform_driver(i2s_pll_clk_driver);
222221

drivers/clk/axs10x/pll_clock.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,9 @@ static int axs10x_pll_clk_probe(struct platform_device *pdev)
257257
&pll_clk->hw);
258258
}
259259

260-
static int axs10x_pll_clk_remove(struct platform_device *pdev)
260+
static void axs10x_pll_clk_remove(struct platform_device *pdev)
261261
{
262262
of_clk_del_provider(pdev->dev.of_node);
263-
return 0;
264263
}
265264

266265
static void __init of_axs10x_pll_clk_setup(struct device_node *node)
@@ -332,7 +331,7 @@ static struct platform_driver axs10x_pll_clk_driver = {
332331
.of_match_table = axs10x_pll_clk_id,
333332
},
334333
.probe = axs10x_pll_clk_probe,
335-
.remove = axs10x_pll_clk_remove,
334+
.remove_new = axs10x_pll_clk_remove,
336335
};
337336
builtin_platform_driver(axs10x_pll_clk_driver);
338337

0 commit comments

Comments
 (0)