Skip to content

Commit 1b55354

Browse files
ukleinekbroonie
authored andcommitted
regulator: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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 <u.kleine-koenig@baylibre.com> Link: https://patch.msgid.link/ab85510f83fa901e44d5d563fe6e768054229bfe.1731398433.git.u.kleine-koenig@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent d1bc2d5 commit 1b55354

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

drivers/regulator/arizona-ldo1.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,18 +375,18 @@ static int madera_ldo1_probe(struct platform_device *pdev)
375375

376376
static struct platform_driver arizona_ldo1_driver = {
377377
.probe = arizona_ldo1_probe,
378-
.remove_new = arizona_ldo1_remove,
379-
.driver = {
380-
.name = "arizona-ldo1",
378+
.remove = arizona_ldo1_remove,
379+
.driver = {
380+
.name = "arizona-ldo1",
381381
.probe_type = PROBE_FORCE_SYNCHRONOUS,
382382
},
383383
};
384384

385385
static struct platform_driver madera_ldo1_driver = {
386386
.probe = madera_ldo1_probe,
387-
.remove_new = arizona_ldo1_remove,
388-
.driver = {
389-
.name = "madera-ldo1",
387+
.remove = arizona_ldo1_remove,
388+
.driver = {
389+
.name = "madera-ldo1",
390390
.probe_type = PROBE_FORCE_SYNCHRONOUS,
391391
},
392392
};

drivers/regulator/bd9571mwv-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ static struct platform_driver bd9571mwv_regulator_driver = {
356356
.pm = DEV_PM_OPS,
357357
},
358358
.probe = bd9571mwv_regulator_probe,
359-
.remove_new = bd9571mwv_regulator_remove,
359+
.remove = bd9571mwv_regulator_remove,
360360
.id_table = bd9571mwv_regulator_id_table,
361361
};
362362
module_platform_driver(bd9571mwv_regulator_driver);

drivers/regulator/db8500-prcmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ static struct platform_driver db8500_regulator_driver = {
480480
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
481481
},
482482
.probe = db8500_regulator_probe,
483-
.remove_new = db8500_regulator_remove,
483+
.remove = db8500_regulator_remove,
484484
};
485485

486486
static int __init db8500_regulator_init(void)

drivers/regulator/stm32-vrefbuf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ MODULE_DEVICE_TABLE(of, stm32_vrefbuf_of_match);
280280

281281
static struct platform_driver stm32_vrefbuf_driver = {
282282
.probe = stm32_vrefbuf_probe,
283-
.remove_new = stm32_vrefbuf_remove,
283+
.remove = stm32_vrefbuf_remove,
284284
.driver = {
285285
.name = "stm32-vrefbuf",
286286
.probe_type = PROBE_PREFER_ASYNCHRONOUS,

drivers/regulator/uniphier-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ MODULE_DEVICE_TABLE(of, uniphier_regulator_match);
207207

208208
static struct platform_driver uniphier_regulator_driver = {
209209
.probe = uniphier_regulator_probe,
210-
.remove_new = uniphier_regulator_remove,
210+
.remove = uniphier_regulator_remove,
211211
.driver = {
212212
.name = "uniphier-regulator",
213213
.probe_type = PROBE_PREFER_ASYNCHRONOUS,

drivers/regulator/userspace-consumer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ MODULE_DEVICE_TABLE(of, regulator_userspace_consumer_of_match);
210210

211211
static struct platform_driver regulator_userspace_consumer_driver = {
212212
.probe = regulator_userspace_consumer_probe,
213-
.remove_new = regulator_userspace_consumer_remove,
213+
.remove = regulator_userspace_consumer_remove,
214214
.driver = {
215215
.name = "reg-userspace-consumer",
216216
.probe_type = PROBE_PREFER_ASYNCHRONOUS,

drivers/regulator/virtual.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ static void regulator_virtual_remove(struct platform_device *pdev)
357357

358358
static struct platform_driver regulator_virtual_consumer_driver = {
359359
.probe = regulator_virtual_probe,
360-
.remove_new = regulator_virtual_remove,
360+
.remove = regulator_virtual_remove,
361361
.driver = {
362362
.name = "reg-virt-consumer",
363363
.probe_type = PROBE_PREFER_ASYNCHRONOUS,

drivers/regulator/wm8350-regulator.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,9 +1304,9 @@ EXPORT_SYMBOL_GPL(wm8350_register_led);
13041304

13051305
static struct platform_driver wm8350_regulator_driver = {
13061306
.probe = wm8350_regulator_probe,
1307-
.remove_new = wm8350_regulator_remove,
1308-
.driver = {
1309-
.name = "wm8350-regulator",
1307+
.remove = wm8350_regulator_remove,
1308+
.driver = {
1309+
.name = "wm8350-regulator",
13101310
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
13111311
},
13121312
};

0 commit comments

Comments
 (0)