Skip to content

Commit dd90484

Browse files
Uwe Kleine-Königbebarino
authored andcommitted
clk: scpi: 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-16-u.kleine-koenig@pengutronix.de Acked-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 34014ff commit dd90484

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/clk/clk-scpi.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ static int scpi_clk_add(struct device *dev, struct device_node *np,
246246
return of_clk_add_hw_provider(np, scpi_of_clk_src_get, clk_data);
247247
}
248248

249-
static int scpi_clocks_remove(struct platform_device *pdev)
249+
static void scpi_clocks_remove(struct platform_device *pdev)
250250
{
251251
struct device *dev = &pdev->dev;
252252
struct device_node *child, *np = dev->of_node;
@@ -258,7 +258,6 @@ static int scpi_clocks_remove(struct platform_device *pdev)
258258

259259
for_each_available_child_of_node(np, child)
260260
of_clk_del_provider(np);
261-
return 0;
262261
}
263262

264263
static int scpi_clocks_probe(struct platform_device *pdev)
@@ -305,7 +304,7 @@ static struct platform_driver scpi_clocks_driver = {
305304
.of_match_table = scpi_clocks_ids,
306305
},
307306
.probe = scpi_clocks_probe,
308-
.remove = scpi_clocks_remove,
307+
.remove_new = scpi_clocks_remove,
309308
};
310309
module_platform_driver(scpi_clocks_driver);
311310

0 commit comments

Comments
 (0)