From a3b4ab60bb705d3693caabedc64a44bbb63403ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sun, 26 Mar 2023 16:30:42 +0200 Subject: [PATCH] media: vpu_core: Convert to platform remove callback returning void MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Hans Verkuil --- drivers/media/platform/amphion/vpu_core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/amphion/vpu_core.c index f9ec1753f7c86..de23627a119a0 100644 --- a/drivers/media/platform/amphion/vpu_core.c +++ b/drivers/media/platform/amphion/vpu_core.c @@ -709,7 +709,7 @@ err_runtime_disable: return ret; } -static int vpu_core_remove(struct platform_device *pdev) +static void vpu_core_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct vpu_core *core = platform_get_drvdata(pdev); @@ -728,8 +728,6 @@ static int vpu_core_remove(struct platform_device *pdev) memunmap(core->rpc.virt); mutex_destroy(&core->lock); mutex_destroy(&core->cmd_lock); - - return 0; } static int __maybe_unused vpu_core_runtime_resume(struct device *dev) @@ -864,7 +862,7 @@ MODULE_DEVICE_TABLE(of, vpu_core_dt_match); static struct platform_driver amphion_vpu_core_driver = { .probe = vpu_core_probe, - .remove = vpu_core_remove, + .remove_new = vpu_core_remove, .driver = { .name = "amphion-vpu-core", .of_match_table = vpu_core_dt_match, -- 2.30.2