From: Uwe Kleine-König Date: Tue, 5 Mar 2024 21:21:00 +0000 (+0100) Subject: fsi: occ: Convert to platform remove callback returning void X-Git-Tag: v6.11-rc1~49^2~37^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29f102dbb11fe1b2f4ea68e3a5721255f37f8bc6;p=thirdparty%2Fkernel%2Flinux.git fsi: occ: 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. Link: https://lists.ozlabs.org/pipermail/linux-fsi/2024-March/000613.html Acked-by: Jeremy Kerr Signed-off-by: Uwe Kleine-König --- diff --git a/drivers/fsi/fsi-occ.c b/drivers/fsi/fsi-occ.c index da35ca9e84a6e..21d2666c41954 100644 --- a/drivers/fsi/fsi-occ.c +++ b/drivers/fsi/fsi-occ.c @@ -703,7 +703,7 @@ static int occ_probe(struct platform_device *pdev) return 0; } -static int occ_remove(struct platform_device *pdev) +static void occ_remove(struct platform_device *pdev) { struct occ *occ = platform_get_drvdata(pdev); @@ -720,8 +720,6 @@ static int occ_remove(struct platform_device *pdev) device_for_each_child(&pdev->dev, NULL, occ_unregister_of_child); ida_simple_remove(&occ_ida, occ->idx); - - return 0; } static const struct of_device_id occ_match[] = { @@ -743,7 +741,7 @@ static struct platform_driver occ_driver = { .of_match_table = occ_match, }, .probe = occ_probe, - .remove = occ_remove, + .remove_new = occ_remove, }; static int occ_init(void)