mfd: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/mfd to use .remove(), with
the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

On the way do a few whitespace changes to make indention consistent.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241025102943.250184-2-u.kleine-koenig@baylibre.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index 8f3ebe651eeaaf7080d06079d159dc8f3eb444ac..b6b44e2e3198097eea650508fa0c61229b72e056 100644 (file)
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -159,7 +159,7 @@ static struct platform_driver ab8500_sysctrl_driver = {
                .of_match_table = ab8500_sysctrl_match,
        },
        .probe = ab8500_sysctrl_probe,
-       .remove_new = ab8500_sysctrl_remove,
+       .remove = ab8500_sysctrl_remove,
 };
 
 static int __init ab8500_sysctrl_init(void)

diff --git a/drivers/mfd/cgbc-core.c b/drivers/mfd/cgbc-core.c
index 93004a6b29c1b98ce02c39bd2945b5261fce3876..ac3042fd5aa161187dc1d0244c06de478891e41a 100644 (file)
--- a/drivers/mfd/cgbc-core.c
+++ b/drivers/mfd/cgbc-core.c
@@ -364,7 +364,7 @@ static struct platform_driver cgbc_driver = {
                .dev_groups     = cgbc_groups,
        },
        .probe          = cgbc_probe,
-       .remove_new     = cgbc_remove,
+       .remove         = cgbc_remove,
 };
 
 static const struct dmi_system_id cgbc_dmi_table[] __initconst = {

diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 2cbd07359954e8683c051d51e165f89e098e4a54..9f84a52b48d6a8994d23edba999398684303ee64 100644 (file)
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -365,7 +365,7 @@ static struct platform_driver cros_ec_dev_driver = {
        },
        .id_table = cros_ec_id,
        .probe = ec_device_probe,
-       .remove_new = ec_device_remove,
+       .remove = ec_device_remove,
 };
 
 static int __init cros_ec_dev_init(void)

diff --git a/drivers/mfd/exynos-lpass.c b/drivers/mfd/exynos-lpass.c
index e58990c85ed8780ea2eaecb13c71cef6dc6c9684..6a585173230b1348b9773638aaa12c5a1f6f6bc7 100644 (file)
--- a/drivers/mfd/exynos-lpass.c
+++ b/drivers/mfd/exynos-lpass.c
@@ -179,13 +179,13 @@ static const struct of_device_id exynos_lpass_of_match[] = {
 MODULE_DEVICE_TABLE(of, exynos_lpass_of_match);
 
 static struct platform_driver exynos_lpass_driver = {
-       .driver = {
+       .driver = {
                .name           = "exynos-lpass",
                .pm             = &lpass_pm_ops,
                .of_match_table = exynos_lpass_of_match,
        },
        .probe  = exynos_lpass_probe,
-       .remove_new = exynos_lpass_remove,
+       .remove = exynos_lpass_remove,
 };
 module_platform_driver(exynos_lpass_driver);
 

diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c
index 2e4ab24041547c47d744e16a69316fddd9d951b9..6fe388da6fb6e8c2c1e7fc2815c93fd279057482 100644 (file)
--- a/drivers/mfd/fsl-imx25-tsadc.c
+++ b/drivers/mfd/fsl-imx25-tsadc.c
@@ -211,7 +211,7 @@ static struct platform_driver mx25_tsadc_driver = {
                .of_match_table = mx25_tsadc_ids,
        },
        .probe = mx25_tsadc_probe,
-       .remove_new = mx25_tsadc_remove,
+       .remove = mx25_tsadc_remove,
 };
 module_platform_driver(mx25_tsadc_driver);
 

diff --git a/drivers/mfd/hi655x-pmic.c b/drivers/mfd/hi655x-pmic.c
index 5f61909c85e926a80600238a2d2ee9eac6a2d7a1..3b4ffcbbee204acccafeef5419f65795bf06b54e 100644 (file)
--- a/drivers/mfd/hi655x-pmic.c
+++ b/drivers/mfd/hi655x-pmic.c
@@ -159,12 +159,12 @@ static const struct of_device_id hi655x_pmic_match[] = {
 MODULE_DEVICE_TABLE(of, hi655x_pmic_match);
 
 static struct platform_driver hi655x_pmic_driver = {
-       .driver = {
-               .name = "hi655x-pmic",
+       .driver = {
+               .name = "hi655x-pmic",
                .of_match_table = hi655x_pmic_match,
        },
-       .probe  = hi655x_pmic_probe,
-       .remove_new = hi655x_pmic_remove,
+       .probe = hi655x_pmic_probe,
+       .remove = hi655x_pmic_remove,
 };
 module_platform_driver(hi655x_pmic_driver);
 

diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 2a83f8678f1d921e085f4748e5b4ed01e100e30e..557061856e584e2dc6fa8babfbe0f86cae94b40c 100644 (file)
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -208,7 +208,7 @@ static void intel_lpss_acpi_remove(struct platform_device *pdev)
 
 static struct platform_driver intel_lpss_acpi_driver = {
        .probe = intel_lpss_acpi_probe,
-       .remove_new = intel_lpss_acpi_remove,
+       .remove = intel_lpss_acpi_remove,
        .driver = {
                .name = "intel-lpss",
                .acpi_match_table = intel_lpss_acpi_ids,

diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
index 8a332852bf97d08b061a6ca3a12a6ed60fa3784e..c5bfb6440a930f5492c6fa1f9b61d50cfc9b4731 100644 (file)
--- a/drivers/mfd/kempld-core.c
+++ b/drivers/mfd/kempld-core.c
@@ -486,7 +486,7 @@ static struct platform_driver kempld_driver = {
                .dev_groups       = pld_groups,
        },
        .probe          = kempld_probe,
-       .remove_new     = kempld_remove,
+       .remove         = kempld_remove,
 };
 
 static const struct dmi_system_id kempld_dmi_table[] __initconst = {

diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
index 3883e472b739dea5cca8307b8cf1a5354d6267c0..228c4a2f4c1fa268a0369c005705cf82366b37e3 100644 (file)
--- a/drivers/mfd/mcp-sa11x0.c
+++ b/drivers/mfd/mcp-sa11x0.c
@@ -286,7 +286,7 @@ static const struct dev_pm_ops mcp_sa11x0_pm_ops = {
 
 static struct platform_driver mcp_sa11x0_driver = {
        .probe          = mcp_sa11x0_probe,
-       .remove_new     = mcp_sa11x0_remove,
+       .remove         = mcp_sa11x0_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .pm     = pm_sleep_ptr(&mcp_sa11x0_pm_ops),

diff --git a/drivers/mfd/mxs-lradc.c b/drivers/mfd/mxs-lradc.c
index b2ebb54331216b98289f899cd68157afb2665a04..64afc76317904b5eb73d82f96efd5ba928abd69c 100644 (file)
--- a/drivers/mfd/mxs-lradc.c
+++ b/drivers/mfd/mxs-lradc.c
@@ -243,7 +243,7 @@ static struct platform_driver mxs_lradc_driver = {
                .of_match_table = mxs_lradc_dt_ids,
        },
        .probe = mxs_lradc_probe,
-       .remove_new = mxs_lradc_remove,
+       .remove = mxs_lradc_remove,
 };
 module_platform_driver(mxs_lradc_driver);
 

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 6de7ba75234552b75b1416431fdd24963295b78d..a77b6fc790f2e06f086b6ecd107317aa4231c344 100644 (file)
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -843,7 +843,7 @@ static struct platform_driver usbhs_omap_driver = {
                .of_match_table = usbhs_omap_dt_ids,
        },
        .probe          = usbhs_omap_probe,
-       .remove_new     = usbhs_omap_remove,
+       .remove         = usbhs_omap_remove,
 };
 
 MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");

diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c
index 5f25ac514ff2b56d4921f34c0729731a1a245434..0f7fdb99c809bb2a8e08b739e7d1902a91761c17 100644 (file)
--- a/drivers/mfd/omap-usb-tll.c
+++ b/drivers/mfd/omap-usb-tll.c
@@ -301,7 +301,7 @@ static struct platform_driver usbtll_omap_driver = {
                .of_match_table = usbtll_omap_dt_ids,
        },
        .probe          = usbtll_omap_probe,
-       .remove_new     = usbtll_omap_remove,
+       .remove         = usbtll_omap_remove,
 };
 
 int omap_tll_init(struct usbhs_omap_platform_data *pdata)

diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c
index ab55906f91f98a8eb3cc54e5e9bdaf3e52910535..1fbba0e666d51f3e265b57b14d5e45512a5eed3d 100644 (file)
--- a/drivers/mfd/pcf50633-adc.c
+++ b/drivers/mfd/pcf50633-adc.c
@@ -243,7 +243,7 @@ static struct platform_driver pcf50633_adc_driver = {
                .name = "pcf50633-adc",
        },
        .probe = pcf50633_adc_probe,
-       .remove_new = pcf50633_adc_remove,
+       .remove = pcf50633_adc_remove,
 };
 
 module_platform_driver(pcf50633_adc_driver);

diff --git a/drivers/mfd/qcom-pm8xxx.c b/drivers/mfd/qcom-pm8xxx.c
index 8b6285f687da55dc9cab66a9bb17bcd4c380bb37..f9ebdf5845b85724c906201015136d37dd28b854 100644 (file)
--- a/drivers/mfd/qcom-pm8xxx.c
+++ b/drivers/mfd/qcom-pm8xxx.c
@@ -595,7 +595,7 @@ static void pm8xxx_remove(struct platform_device *pdev)
 
 static struct platform_driver pm8xxx_driver = {
        .probe          = pm8xxx_probe,
-       .remove_new     = pm8xxx_remove,
+       .remove         = pm8xxx_remove,
        .driver         = {
                .name   = "pm8xxx-core",
                .of_match_table = pm8xxx_id_table,

diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index b3592982a83b55f68948cfc54e499f2f9bd6e1c0..0469e85d72cff39ded4f9246a59d471aeb536e1e 100644 (file)
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1705,7 +1705,7 @@ static struct platform_driver sm501_plat_driver = {
                .of_match_table = of_sm501_match_tbl,
        },
        .probe          = sm501_plat_probe,
-       .remove_new     = sm501_plat_remove,
+       .remove         = sm501_plat_remove,
        .suspend        = pm_sleep_ptr(sm501_plat_suspend),
        .resume         = pm_sleep_ptr(sm501_plat_resume),
 };

diff --git a/drivers/mfd/stm32-timers.c b/drivers/mfd/stm32-timers.c
index 9fd13d88950c67a0539b9caa2420751f7e7899db..650724e19b88622ea0bb54b44ac9c3e4e94c59f0 100644 (file)
--- a/drivers/mfd/stm32-timers.c
+++ b/drivers/mfd/stm32-timers.c
@@ -326,7 +326,7 @@ MODULE_DEVICE_TABLE(of, stm32_timers_of_match);
 
 static struct platform_driver stm32_timers_driver = {
        .probe = stm32_timers_probe,
-       .remove_new = stm32_timers_remove,
+       .remove = stm32_timers_remove,
        .driver = {
                .name = "stm32-timers",
                .of_match_table = stm32_timers_of_match,

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 0c1364d88469f53c1486d5119c7451e75c80b86b..068c25401c6cda3fb2c3468d91af769134a01ff2 100644 (file)
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -377,7 +377,7 @@ static struct platform_driver ti_tscadc_driver = {
                .of_match_table = ti_tscadc_dt_ids,
        },
        .probe  = ti_tscadc_probe,
-       .remove_new = ti_tscadc_remove,
+       .remove = ti_tscadc_remove,
 
 };
 

diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c
index f206a9c50e9d84ac71e86a6cc3294008093a7809..7098712ea0089920d24ea9a38f9553b946566eba 100644 (file)
--- a/drivers/mfd/tps65911-comparator.c
+++ b/drivers/mfd/tps65911-comparator.c
@@ -154,7 +154,7 @@ static struct platform_driver tps65911_comparator_driver = {
                .name = "tps65911-comparator",
        },
        .probe = tps65911_comparator_probe,
-       .remove_new = tps65911_comparator_remove,
+       .remove = tps65911_comparator_remove,
 };
 
 static int __init tps65911_comparator_init(void)

diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c
index d436ddf661dab8ad3f73f4e19061cb0e15631aec..a4a550bafb3cc14eccb870cbde6858a4b40033d5 100644 (file)
--- a/drivers/mfd/twl4030-audio.c
+++ b/drivers/mfd/twl4030-audio.c
@@ -276,7 +276,7 @@ static struct platform_driver twl4030_audio_driver = {
                .of_match_table = twl4030_audio_of_match,
        },
        .probe          = twl4030_audio_probe,
-       .remove_new     = twl4030_audio_remove,
+       .remove         = twl4030_audio_remove,
 };
 
 module_platform_driver(twl4030_audio_driver);