regulator: 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/regulator 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.

A few whitespace changes are done en passant to make indention
consistent.

Signed-off-by: Uwe Kleine-König <[email protected]>
Link: https://patch.msgid.link/ab85510f83fa901e44d5d563fe6e768054229bfe.1731398433.git.u.kleine-koenig@baylibre.com
Signed-off-by: Mark Brown <[email protected]>

diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 4b54068d4f599041a1c708db0a3c7564e1b651a8..501843996faae1089905a1972dc42d48f00c5817 100644 (file)
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -375,18 +375,18 @@ static int madera_ldo1_probe(struct platform_device *pdev)
 
 static struct platform_driver arizona_ldo1_driver = {
        .probe = arizona_ldo1_probe,
-       .remove_new = arizona_ldo1_remove,
-       .driver         = {
-               .name   = "arizona-ldo1",
+       .remove = arizona_ldo1_remove,
+       .driver = {
+               .name = "arizona-ldo1",
                .probe_type = PROBE_FORCE_SYNCHRONOUS,
        },
 };
 
 static struct platform_driver madera_ldo1_driver = {
        .probe = madera_ldo1_probe,
-       .remove_new = arizona_ldo1_remove,
-       .driver         = {
-               .name   = "madera-ldo1",
+       .remove = arizona_ldo1_remove,
+       .driver = {
+               .name = "madera-ldo1",
                .probe_type = PROBE_FORCE_SYNCHRONOUS,
        },
 };

diff --git a/drivers/regulator/bd9571mwv-regulator.c b/drivers/regulator/bd9571mwv-regulator.c
index c7ceba56e7dc9011e8c4b80df5ecc81b65f38cb5..209beabb5c37c6e2d6582276920c9f3dfe33e200 100644 (file)
--- a/drivers/regulator/bd9571mwv-regulator.c
+++ b/drivers/regulator/bd9571mwv-regulator.c
@@ -356,7 +356,7 @@ static struct platform_driver bd9571mwv_regulator_driver = {
                .pm = DEV_PM_OPS,
        },
        .probe = bd9571mwv_regulator_probe,
-       .remove_new = bd9571mwv_regulator_remove,
+       .remove = bd9571mwv_regulator_remove,
        .id_table = bd9571mwv_regulator_id_table,
 };
 module_platform_driver(bd9571mwv_regulator_driver);

diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 1e2d54da1b9a7471692ce35476ab1af8237aa012..1ec2e1348891df1257c847a19b7565c8c8c19ce9 100644 (file)
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -480,7 +480,7 @@ static struct platform_driver db8500_regulator_driver = {
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
        .probe = db8500_regulator_probe,
-       .remove_new = db8500_regulator_remove,
+       .remove = db8500_regulator_remove,
 };
 
 static int __init db8500_regulator_init(void)

diff --git a/drivers/regulator/stm32-vrefbuf.c b/drivers/regulator/stm32-vrefbuf.c
index 40855105dd3357a37618b19be91e99b047342e07..a85ea94f06730789b6450ea2d91e6b075637ae4f 100644 (file)
--- a/drivers/regulator/stm32-vrefbuf.c
+++ b/drivers/regulator/stm32-vrefbuf.c
@@ -280,7 +280,7 @@ MODULE_DEVICE_TABLE(of, stm32_vrefbuf_of_match);
 
 static struct platform_driver stm32_vrefbuf_driver = {
        .probe = stm32_vrefbuf_probe,
-       .remove_new = stm32_vrefbuf_remove,
+       .remove = stm32_vrefbuf_remove,
        .driver = {
                .name  = "stm32-vrefbuf",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/regulator/uniphier-regulator.c b/drivers/regulator/uniphier-regulator.c
index 5f868042392fd833d992da13404a67d3a5236ba3..74939b7fcd81850095d25d3433aa8fd1ba74d763 100644 (file)
--- a/drivers/regulator/uniphier-regulator.c
+++ b/drivers/regulator/uniphier-regulator.c
@@ -207,7 +207,7 @@ MODULE_DEVICE_TABLE(of, uniphier_regulator_match);
 
 static struct platform_driver uniphier_regulator_driver = {
        .probe = uniphier_regulator_probe,
-       .remove_new = uniphier_regulator_remove,
+       .remove = uniphier_regulator_remove,
        .driver = {
                .name  = "uniphier-regulator",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index 6153d0295b6de737c4e12265cdd31bfa8d79e526..72bb5ffb49a8ce4f63ee551ee53318aa572a9329 100644 (file)
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -210,7 +210,7 @@ MODULE_DEVICE_TABLE(of, regulator_userspace_consumer_of_match);
 
 static struct platform_driver regulator_userspace_consumer_driver = {
        .probe          = regulator_userspace_consumer_probe,
-       .remove_new     = regulator_userspace_consumer_remove,
+       .remove         = regulator_userspace_consumer_remove,
        .driver         = {
                .name           = "reg-userspace-consumer",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c
index 0a0ee186c6aff3ddbc5341b87bd3f8f45fbd6e64..218a0d66a15282f6020fa03c09e2fba2d1efccb4 100644 (file)
--- a/drivers/regulator/virtual.c
+++ b/drivers/regulator/virtual.c
@@ -357,7 +357,7 @@ static void regulator_virtual_remove(struct platform_device *pdev)
 
 static struct platform_driver regulator_virtual_consumer_driver = {
        .probe          = regulator_virtual_probe,
-       .remove_new     = regulator_virtual_remove,
+       .remove         = regulator_virtual_remove,
        .driver         = {
                .name           = "reg-virt-consumer",
                .probe_type     = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 9939a5d2cbec0a30c2ff6ec6160cb5c7570a4689..d09864bae5ef4f5237bdd6c9d6742619123d7641 100644 (file)
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -1304,9 +1304,9 @@ EXPORT_SYMBOL_GPL(wm8350_register_led);
 
 static struct platform_driver wm8350_regulator_driver = {
        .probe = wm8350_regulator_probe,
-       .remove_new = wm8350_regulator_remove,
-       .driver         = {
-               .name   = "wm8350-regulator",
+       .remove = wm8350_regulator_remove,
+       .driver = {
+               .name = "wm8350-regulator",
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
 };