Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <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>

authored by

Uwe Kleine-König and committed by
Mark Brown
1b553547 d1bc2d5c

+15 -15
+6 -6
drivers/regulator/arizona-ldo1.c
··· 375 375 376 376 static struct platform_driver arizona_ldo1_driver = { 377 377 .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", 381 381 .probe_type = PROBE_FORCE_SYNCHRONOUS, 382 382 }, 383 383 }; 384 384 385 385 static struct platform_driver madera_ldo1_driver = { 386 386 .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", 390 390 .probe_type = PROBE_FORCE_SYNCHRONOUS, 391 391 }, 392 392 };
+1 -1
drivers/regulator/bd9571mwv-regulator.c
··· 356 356 .pm = DEV_PM_OPS, 357 357 }, 358 358 .probe = bd9571mwv_regulator_probe, 359 - .remove_new = bd9571mwv_regulator_remove, 359 + .remove = bd9571mwv_regulator_remove, 360 360 .id_table = bd9571mwv_regulator_id_table, 361 361 }; 362 362 module_platform_driver(bd9571mwv_regulator_driver);
+1 -1
drivers/regulator/db8500-prcmu.c
··· 480 480 .probe_type = PROBE_PREFER_ASYNCHRONOUS, 481 481 }, 482 482 .probe = db8500_regulator_probe, 483 - .remove_new = db8500_regulator_remove, 483 + .remove = db8500_regulator_remove, 484 484 }; 485 485 486 486 static int __init db8500_regulator_init(void)
+1 -1
drivers/regulator/stm32-vrefbuf.c
··· 280 280 281 281 static struct platform_driver stm32_vrefbuf_driver = { 282 282 .probe = stm32_vrefbuf_probe, 283 - .remove_new = stm32_vrefbuf_remove, 283 + .remove = stm32_vrefbuf_remove, 284 284 .driver = { 285 285 .name = "stm32-vrefbuf", 286 286 .probe_type = PROBE_PREFER_ASYNCHRONOUS,
+1 -1
drivers/regulator/uniphier-regulator.c
··· 207 207 208 208 static struct platform_driver uniphier_regulator_driver = { 209 209 .probe = uniphier_regulator_probe, 210 - .remove_new = uniphier_regulator_remove, 210 + .remove = uniphier_regulator_remove, 211 211 .driver = { 212 212 .name = "uniphier-regulator", 213 213 .probe_type = PROBE_PREFER_ASYNCHRONOUS,
+1 -1
drivers/regulator/userspace-consumer.c
··· 210 210 211 211 static struct platform_driver regulator_userspace_consumer_driver = { 212 212 .probe = regulator_userspace_consumer_probe, 213 - .remove_new = regulator_userspace_consumer_remove, 213 + .remove = regulator_userspace_consumer_remove, 214 214 .driver = { 215 215 .name = "reg-userspace-consumer", 216 216 .probe_type = PROBE_PREFER_ASYNCHRONOUS,
+1 -1
drivers/regulator/virtual.c
··· 357 357 358 358 static struct platform_driver regulator_virtual_consumer_driver = { 359 359 .probe = regulator_virtual_probe, 360 - .remove_new = regulator_virtual_remove, 360 + .remove = regulator_virtual_remove, 361 361 .driver = { 362 362 .name = "reg-virt-consumer", 363 363 .probe_type = PROBE_PREFER_ASYNCHRONOUS,
+3 -3
drivers/regulator/wm8350-regulator.c
··· 1304 1304 1305 1305 static struct platform_driver wm8350_regulator_driver = { 1306 1306 .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", 1310 1310 .probe_type = PROBE_PREFER_ASYNCHRONOUS, 1311 1311 }, 1312 1312 };