Skip to content

Commit ffbe84a

Browse files
Uwe Kleine-Königandersson
authored andcommitted
soc: qcom: qcom_aoss: 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> # qcom Link: https://lore.kernel.org/r/20230925095532.1984344-23-u.kleine-koenig@pengutronix.de Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 4b3373e commit ffbe84a

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/soc/qcom/qcom_aoss.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ static int qmp_probe(struct platform_device *pdev)
533533
return ret;
534534
}
535535

536-
static int qmp_remove(struct platform_device *pdev)
536+
static void qmp_remove(struct platform_device *pdev)
537537
{
538538
struct qmp *qmp = platform_get_drvdata(pdev);
539539

@@ -542,8 +542,6 @@ static int qmp_remove(struct platform_device *pdev)
542542

543543
qmp_close(qmp);
544544
mbox_free_channel(qmp->mbox_chan);
545-
546-
return 0;
547545
}
548546

549547
static const struct of_device_id qmp_dt_match[] = {
@@ -565,7 +563,7 @@ static struct platform_driver qmp_driver = {
565563
.suppress_bind_attrs = true,
566564
},
567565
.probe = qmp_probe,
568-
.remove = qmp_remove,
566+
.remove_new = qmp_remove,
569567
};
570568
module_platform_driver(qmp_driver);
571569

0 commit comments

Comments
 (0)