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 <[email protected]>
Link: https://patch.msgid.link/9ee1a9813f53698be62aab9d810b2d97a2a9f186.1731397722.git.u.kleine-koenig@baylibre.com
[ rjw: Subject edit ]
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 7c5b040a83e8d69f89cf8c338b521596e5707000..1f69be8f51a29b588b7411fbaa064a818344a30d 100644 (file)
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -290,7 +290,7 @@ static void acpi_ac_remove(struct platform_device *pdev)
 
 static struct platform_driver acpi_ac_driver = {
        .probe = acpi_ac_probe,
-       .remove_new = acpi_ac_remove,
+       .remove = acpi_ac_remove,
        .driver = {
                .name = "ac",
                .acpi_match_table = ac_device_ids,

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 42b7220d4cfda78dc92222b0be956e043131876f..4ec20fd5698529877c0c96d90845158037e70331 100644 (file)
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(acpi, pad_device_ids);
 
 static struct platform_driver acpi_pad_driver = {
        .probe = acpi_pad_probe,
-       .remove_new = acpi_pad_remove,
+       .remove = acpi_pad_remove,
        .driver = {
                .dev_groups = acpi_pad_groups,
                .name = "processor_aggregator",

diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c
index b831cb8e53dc313e15dd0809e56c156a61483796..825c2a8acea436be10eb4cf5d78b030aa6ebffb7 100644 (file)
--- a/drivers/acpi/acpi_tad.c
+++ b/drivers/acpi/acpi_tad.c
@@ -684,7 +684,7 @@ static struct platform_driver acpi_tad_driver = {
                .acpi_match_table = acpi_tad_ids,
        },
        .probe = acpi_tad_probe,
-       .remove_new = acpi_tad_remove,
+       .remove = acpi_tad_remove,
 };
 MODULE_DEVICE_TABLE(acpi, acpi_tad_ids);
 

diff --git a/drivers/acpi/apei/einj-core.c b/drivers/acpi/apei/einj-core.c
index 5c22720f43ccb971d69505ea88f30310ce5c562b..04731a5b01faaba534bad853d0acc4c8a873a53b 100644 (file)
--- a/drivers/acpi/apei/einj-core.c
+++ b/drivers/acpi/apei/einj-core.c
@@ -880,7 +880,7 @@ static struct platform_device *einj_dev;
  * triggering a section mismatch warning.
  */
 static struct platform_driver einj_driver __refdata = {
-       .remove_new = __exit_p(einj_remove),
+       .remove = __exit_p(einj_remove),
        .driver = {
                .name = "acpi-einj",
        },

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index ada93cfde9ba1cf817b240b352876c330112d7eb..a2491905f165114287d709a150f5f37c40a7cee0 100644 (file)
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -1605,7 +1605,7 @@ static struct platform_driver ghes_platform_driver = {
                .name   = "GHES",
        },
        .probe          = ghes_probe,
-       .remove_new     = ghes_remove,
+       .remove         = ghes_remove,
 };
 
 void __init acpi_ghes_init(void)

diff --git a/drivers/acpi/arm64/agdi.c b/drivers/acpi/arm64/agdi.c
index f5f21dd0d277e9612c444c62843b7bece450706f..e0df3daa4abf0f5adf532426ab2ca76ec01a13de 100644 (file)
--- a/drivers/acpi/arm64/agdi.c
+++ b/drivers/acpi/arm64/agdi.c
@@ -88,7 +88,7 @@ static struct platform_driver agdi_driver = {
                .name = "agdi",
        },
        .probe = agdi_probe,
-       .remove_new = agdi_remove,
+       .remove = agdi_remove,
 };
 
 void __init acpi_agdi_init(void)

diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch_fivr.c
index d202730fafd8d6613330a589d217c247d0abd914..624fce67ce435982ddcf6c56820a2a31e1948a04 100644 (file)
--- a/drivers/acpi/dptf/dptf_pch_fivr.c
+++ b/drivers/acpi/dptf/dptf_pch_fivr.c
@@ -158,7 +158,7 @@ MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
 
 static struct platform_driver pch_fivr_driver = {
        .probe = pch_fivr_add,
-       .remove_new = pch_fivr_remove,
+       .remove = pch_fivr_remove,
        .driver = {
                .name = "dptf_pch_fivr",
                .acpi_match_table = pch_fivr_device_ids,

diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
index 8023b3e2331561ac53444997027eeab026b2ba10..3d3edd81b1729b229f0ea01db86060345bb01575 100644 (file)
--- a/drivers/acpi/dptf/dptf_power.c
+++ b/drivers/acpi/dptf/dptf_power.c
@@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
 
 static struct platform_driver dptf_power_driver = {
        .probe = dptf_power_add,
-       .remove_new = dptf_power_remove,
+       .remove = dptf_power_remove,
        .driver = {
                .name = "dptf_power",
                .acpi_match_table = int3407_device_ids,

diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c
index 11778c93254bfcf5cab1b40463173e590b5a9345..5c35cbc7f6ff12f3384fc9877779379e72ff621e 100644 (file)
--- a/drivers/acpi/evged.c
+++ b/drivers/acpi/evged.c
@@ -185,7 +185,7 @@ static const struct acpi_device_id ged_acpi_ids[] = {
 
 static struct platform_driver ged_driver = {
        .probe = ged_probe,
-       .remove_new = ged_remove,
+       .remove = ged_remove,
        .shutdown = ged_shutdown,
        .driver = {
                .name = MODULE_NAME,

diff --git a/drivers/acpi/fan_core.c b/drivers/acpi/fan_core.c
index 7cea4495f19bbe1000b3123f29584a1384848074..3ea9cfcff46e798996c0223daa0b2f97ec8f1a00 100644 (file)
--- a/drivers/acpi/fan_core.c
+++ b/drivers/acpi/fan_core.c
@@ -448,7 +448,7 @@ static const struct dev_pm_ops acpi_fan_pm = {
 
 static struct platform_driver acpi_fan_driver = {
        .probe = acpi_fan_probe,
-       .remove_new = acpi_fan_remove,
+       .remove = acpi_fan_remove,
        .driver = {
                .name = "acpi-fan",
                .acpi_match_table = fan_device_ids,

diff --git a/drivers/acpi/pfr_telemetry.c b/drivers/acpi/pfr_telemetry.c
index 998264a7333d6e56b813595b5383e503712d1c2a..cd6ca7121a145e32848ee049716fcb0fac6e168f 100644 (file)
--- a/drivers/acpi/pfr_telemetry.c
+++ b/drivers/acpi/pfr_telemetry.c
@@ -425,7 +425,7 @@ static struct platform_driver acpi_pfrt_log_driver = {
                .acpi_match_table = acpi_pfrt_log_ids,
        },
        .probe = acpi_pfrt_log_probe,
-       .remove_new = acpi_pfrt_log_remove,
+       .remove = acpi_pfrt_log_remove,
 };
 module_platform_driver(acpi_pfrt_log_driver);
 

diff --git a/drivers/acpi/pfr_update.c b/drivers/acpi/pfr_update.c
index 8b2910995fc1a9c82f9e9479f1d0b34680d86817..031d1ba81b866d22107ea7db393b73a42f9cc3bb 100644 (file)
--- a/drivers/acpi/pfr_update.c
+++ b/drivers/acpi/pfr_update.c
@@ -565,7 +565,7 @@ static struct platform_driver acpi_pfru_driver = {
                .acpi_match_table = acpi_pfru_ids,
        },
        .probe = acpi_pfru_probe,
-       .remove_new = acpi_pfru_remove,
+       .remove = acpi_pfru_remove,
 };
 module_platform_driver(acpi_pfru_driver);