platform/x86/siemens: simatic-ipc-batt: Simplify simatic_ipc_batt_remove()

Instead of unconditionally returning zero, let simatic_ipc_batt_remove()
return no value. This is a preparation to convert the drivers using this
function to struct platform_driver::remove_new().

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230927081040.2198742-24-u.kleine-koenig@pengutronix.de
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
index 8a67979d8f963fd2e46aeb95f30d90115af4a080..3e22a6bc9118bc95fa43ed845b54b08cd03ec95d 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
@@ -27,7 +27,9 @@ static struct gpiod_lookup_table simatic_ipc_batt_gpio_table_127e = {
 
 static int simatic_ipc_batt_apollolake_remove(struct platform_device *pdev)
 {
-       return simatic_ipc_batt_remove(pdev, &simatic_ipc_batt_gpio_table_127e);
+       simatic_ipc_batt_remove(pdev, &simatic_ipc_batt_gpio_table_127e);
+
+       return 0;
 }
 
 static int simatic_ipc_batt_apollolake_probe(struct platform_device *pdev)

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
index 607d033911a2ab140935f4edfb80cc60e8c4979c..9e08c659f27d9d2cb592c81f6dea60f43d4daddb 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
@@ -27,7 +27,9 @@ static struct gpiod_lookup_table simatic_ipc_batt_gpio_table_bx_21a = {
 
 static int simatic_ipc_batt_elkhartlake_remove(struct platform_device *pdev)
 {
-       return simatic_ipc_batt_remove(pdev, &simatic_ipc_batt_gpio_table_bx_21a);
+       simatic_ipc_batt_remove(pdev, &simatic_ipc_batt_gpio_table_bx_21a);
+
+       return 0;
 }
 
 static int simatic_ipc_batt_elkhartlake_probe(struct platform_device *pdev)

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c b/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
index a66107e0fe1ebc82cff1afb3d1b68cb9fbd73392..19c302a6891189a6b1c8d058c41488895eecd1d2 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
@@ -47,7 +47,9 @@ static struct gpiod_lookup_table simatic_ipc_batt_gpio_table_bx_59a = {
 
 static int simatic_ipc_batt_f7188x_remove(struct platform_device *pdev)
 {
-       return simatic_ipc_batt_remove(pdev, batt_lookup_table);
+       simatic_ipc_batt_remove(pdev, batt_lookup_table);
+
+       return 0;
 }
 
 static int simatic_ipc_batt_f7188x_probe(struct platform_device *pdev)

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt.c b/drivers/platform/x86/siemens/simatic-ipc-batt.c
index ef28c806b383357260fbd0cbd23cc05504bbf0b2..07cd4944de3214e96c472d9266ba855a0b368375 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt.c
@@ -146,10 +146,9 @@ static const struct hwmon_chip_info simatic_ipc_batt_chip_info = {
        .info = simatic_ipc_batt_info,
 };
 
-int simatic_ipc_batt_remove(struct platform_device *pdev, struct gpiod_lookup_table *table)
+void simatic_ipc_batt_remove(struct platform_device *pdev, struct gpiod_lookup_table *table)
 {
        gpiod_remove_lookup_table(table);
-       return 0;
 }
 EXPORT_SYMBOL_GPL(simatic_ipc_batt_remove);
 
@@ -230,7 +229,9 @@ EXPORT_SYMBOL_GPL(simatic_ipc_batt_probe);
 
 static int simatic_ipc_batt_io_remove(struct platform_device *pdev)
 {
-       return simatic_ipc_batt_remove(pdev, NULL);
+       simatic_ipc_batt_remove(pdev, NULL);
+
+       return 0;
 }
 
 static int simatic_ipc_batt_io_probe(struct platform_device *pdev)

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt.h b/drivers/platform/x86/siemens/simatic-ipc-batt.h
index 4545cd3e30269027a2515d34d8b08f47f8775612..89891db26a2c2dd5d37dc73b03f93702d746f7fa 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt.h
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt.h
@@ -14,7 +14,7 @@
 int simatic_ipc_batt_probe(struct platform_device *pdev,
                           struct gpiod_lookup_table *table);
 
-int simatic_ipc_batt_remove(struct platform_device *pdev,
-                           struct gpiod_lookup_table *table);
+void simatic_ipc_batt_remove(struct platform_device *pdev,
+                            struct gpiod_lookup_table *table);
 
 #endif /* _SIMATIC_IPC_BATT_H */