Skip to content

Commit 0b742c4

Browse files
Uwe Kleine-Königandersson
authored andcommitted
soc: qcom: ocmem: 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> Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> Link: https://lore.kernel.org/r/20230925095532.1984344-21-u.kleine-koenig@pengutronix.de Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent d85a9d1 commit 0b742c4

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/soc/qcom/ocmem.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,12 @@ static int ocmem_dev_probe(struct platform_device *pdev)
416416
return ret;
417417
}
418418

419-
static int ocmem_dev_remove(struct platform_device *pdev)
419+
static void ocmem_dev_remove(struct platform_device *pdev)
420420
{
421421
struct ocmem *ocmem = platform_get_drvdata(pdev);
422422

423423
clk_disable_unprepare(ocmem->core_clk);
424424
clk_disable_unprepare(ocmem->iface_clk);
425-
426-
return 0;
427425
}
428426

429427
static const struct ocmem_config ocmem_8226_config = {
@@ -446,7 +444,7 @@ MODULE_DEVICE_TABLE(of, ocmem_of_match);
446444

447445
static struct platform_driver ocmem_driver = {
448446
.probe = ocmem_dev_probe,
449-
.remove = ocmem_dev_remove,
447+
.remove_new = ocmem_dev_remove,
450448
.driver = {
451449
.name = "ocmem",
452450
.of_match_table = ocmem_of_match,

0 commit comments

Comments
 (0)