Skip to content

Commit 7c93da5

Browse files
Uwe Kleine-Königandersson
authored andcommitted
soc: qcom: rmtfs_mem: 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-26-u.kleine-koenig@pengutronix.de Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent a47ff90 commit 7c93da5

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/soc/qcom/rmtfs_mem.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ static int qcom_rmtfs_mem_probe(struct platform_device *pdev)
290290
return ret;
291291
}
292292

293-
static int qcom_rmtfs_mem_remove(struct platform_device *pdev)
293+
static void qcom_rmtfs_mem_remove(struct platform_device *pdev)
294294
{
295295
struct qcom_rmtfs_mem *rmtfs_mem = dev_get_drvdata(&pdev->dev);
296296
struct qcom_scm_vmperm perm;
@@ -305,8 +305,6 @@ static int qcom_rmtfs_mem_remove(struct platform_device *pdev)
305305

306306
cdev_device_del(&rmtfs_mem->cdev, &rmtfs_mem->dev);
307307
put_device(&rmtfs_mem->dev);
308-
309-
return 0;
310308
}
311309

312310
static const struct of_device_id qcom_rmtfs_mem_of_match[] = {
@@ -317,7 +315,7 @@ MODULE_DEVICE_TABLE(of, qcom_rmtfs_mem_of_match);
317315

318316
static struct platform_driver qcom_rmtfs_mem_driver = {
319317
.probe = qcom_rmtfs_mem_probe,
320-
.remove = qcom_rmtfs_mem_remove,
318+
.remove_new = qcom_rmtfs_mem_remove,
321319
.driver = {
322320
.name = "qcom_rmtfs_mem",
323321
.of_match_table = qcom_rmtfs_mem_of_match,

0 commit comments

Comments
 (0)