[24/27] platform/x86/siemens: simatic-ipc-batt: Convert to platform remove callback returning void

Commit Message

Uwe Kleine-König Sept. 27, 2023, 8:10 a.m. UTC

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 <[e-mail]>
---
 drivers/platform/x86/siemens/simatic-ipc-batt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Patch

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt.c b/drivers/platform/x86/siemens/simatic-ipc-batt.c
index 07cd4944de32..c6dd263b4ee3 100644
--- a/drivers/platform/x86/siemens/simatic-ipc-batt.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt.c
@@ -227,11 +227,9 @@  int simatic_ipc_batt_probe(struct platform_device *pdev, struct gpiod_lookup_tab
 }
 EXPORT_SYMBOL_GPL(simatic_ipc_batt_probe);
 
-static int simatic_ipc_batt_io_remove(struct platform_device *pdev)
+static void simatic_ipc_batt_io_remove(struct platform_device *pdev)
 {
 	simatic_ipc_batt_remove(pdev, NULL);
-
-	return 0;
 }
 
 static int simatic_ipc_batt_io_probe(struct platform_device *pdev)
@@ -241,7 +239,7 @@  static int simatic_ipc_batt_io_probe(struct platform_device *pdev)
 
 static struct platform_driver simatic_ipc_batt_driver = {
 	.probe = simatic_ipc_batt_io_probe,
-	.remove = simatic_ipc_batt_io_remove,
+	.remove_new = simatic_ipc_batt_io_remove,
 	.driver = {
 		.name = KBUILD_MODNAME,
 	},