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

ACPI: 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/acpi 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.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/9ee1a9813f53698be62aab9d810b2d97a2a9f186.1731397722.git.u.kleine-koenig@baylibre.com
[ rjw: Subject edit ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Uwe Kleine-König and committed by
Rafael J. Wysocki
927df4ca 107d55ef

+12 -12
+1 -1
drivers/acpi/ac.c
··· 290 290 291 291 static struct platform_driver acpi_ac_driver = { 292 292 .probe = acpi_ac_probe, 293 - .remove_new = acpi_ac_remove, 293 + .remove = acpi_ac_remove, 294 294 .driver = { 295 295 .name = "ac", 296 296 .acpi_match_table = ac_device_ids,
+1 -1
drivers/acpi/acpi_pad.c
··· 462 462 463 463 static struct platform_driver acpi_pad_driver = { 464 464 .probe = acpi_pad_probe, 465 - .remove_new = acpi_pad_remove, 465 + .remove = acpi_pad_remove, 466 466 .driver = { 467 467 .dev_groups = acpi_pad_groups, 468 468 .name = "processor_aggregator",
+1 -1
drivers/acpi/acpi_tad.c
··· 684 684 .acpi_match_table = acpi_tad_ids, 685 685 }, 686 686 .probe = acpi_tad_probe, 687 - .remove_new = acpi_tad_remove, 687 + .remove = acpi_tad_remove, 688 688 }; 689 689 MODULE_DEVICE_TABLE(acpi, acpi_tad_ids); 690 690
+1 -1
drivers/acpi/apei/einj-core.c
··· 880 880 * triggering a section mismatch warning. 881 881 */ 882 882 static struct platform_driver einj_driver __refdata = { 883 - .remove_new = __exit_p(einj_remove), 883 + .remove = __exit_p(einj_remove), 884 884 .driver = { 885 885 .name = "acpi-einj", 886 886 },
+1 -1
drivers/acpi/apei/ghes.c
··· 1605 1605 .name = "GHES", 1606 1606 }, 1607 1607 .probe = ghes_probe, 1608 - .remove_new = ghes_remove, 1608 + .remove = ghes_remove, 1609 1609 }; 1610 1610 1611 1611 void __init acpi_ghes_init(void)
+1 -1
drivers/acpi/arm64/agdi.c
··· 88 88 .name = "agdi", 89 89 }, 90 90 .probe = agdi_probe, 91 - .remove_new = agdi_remove, 91 + .remove = agdi_remove, 92 92 }; 93 93 94 94 void __init acpi_agdi_init(void)
+1 -1
drivers/acpi/dptf/dptf_pch_fivr.c
··· 158 158 159 159 static struct platform_driver pch_fivr_driver = { 160 160 .probe = pch_fivr_add, 161 - .remove_new = pch_fivr_remove, 161 + .remove = pch_fivr_remove, 162 162 .driver = { 163 163 .name = "dptf_pch_fivr", 164 164 .acpi_match_table = pch_fivr_device_ids,
+1 -1
drivers/acpi/dptf/dptf_power.c
··· 242 242 243 243 static struct platform_driver dptf_power_driver = { 244 244 .probe = dptf_power_add, 245 - .remove_new = dptf_power_remove, 245 + .remove = dptf_power_remove, 246 246 .driver = { 247 247 .name = "dptf_power", 248 248 .acpi_match_table = int3407_device_ids,
+1 -1
drivers/acpi/evged.c
··· 185 185 186 186 static struct platform_driver ged_driver = { 187 187 .probe = ged_probe, 188 - .remove_new = ged_remove, 188 + .remove = ged_remove, 189 189 .shutdown = ged_shutdown, 190 190 .driver = { 191 191 .name = MODULE_NAME,
+1 -1
drivers/acpi/fan_core.c
··· 448 448 449 449 static struct platform_driver acpi_fan_driver = { 450 450 .probe = acpi_fan_probe, 451 - .remove_new = acpi_fan_remove, 451 + .remove = acpi_fan_remove, 452 452 .driver = { 453 453 .name = "acpi-fan", 454 454 .acpi_match_table = fan_device_ids,
+1 -1
drivers/acpi/pfr_telemetry.c
··· 425 425 .acpi_match_table = acpi_pfrt_log_ids, 426 426 }, 427 427 .probe = acpi_pfrt_log_probe, 428 - .remove_new = acpi_pfrt_log_remove, 428 + .remove = acpi_pfrt_log_remove, 429 429 }; 430 430 module_platform_driver(acpi_pfrt_log_driver); 431 431
+1 -1
drivers/acpi/pfr_update.c
··· 565 565 .acpi_match_table = acpi_pfru_ids, 566 566 }, 567 567 .probe = acpi_pfru_probe, 568 - .remove_new = acpi_pfru_remove, 568 + .remove = acpi_pfru_remove, 569 569 }; 570 570 module_platform_driver(acpi_pfru_driver); 571 571