Skip to content

Commit 927df4c

Browse files
ukleinekrafaeljw
authored andcommitted
ACPI: 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/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>
1 parent 107d55e commit 927df4c

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

drivers/acpi/ac.c

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

291291
static struct platform_driver acpi_ac_driver = {
292292
.probe = acpi_ac_probe,
293-
.remove_new = acpi_ac_remove,
293+
.remove = acpi_ac_remove,
294294
.driver = {
295295
.name = "ac",
296296
.acpi_match_table = ac_device_ids,

drivers/acpi/acpi_pad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ MODULE_DEVICE_TABLE(acpi, pad_device_ids);
462462

463463
static struct platform_driver acpi_pad_driver = {
464464
.probe = acpi_pad_probe,
465-
.remove_new = acpi_pad_remove,
465+
.remove = acpi_pad_remove,
466466
.driver = {
467467
.dev_groups = acpi_pad_groups,
468468
.name = "processor_aggregator",

drivers/acpi/acpi_tad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ static struct platform_driver acpi_tad_driver = {
684684
.acpi_match_table = acpi_tad_ids,
685685
},
686686
.probe = acpi_tad_probe,
687-
.remove_new = acpi_tad_remove,
687+
.remove = acpi_tad_remove,
688688
};
689689
MODULE_DEVICE_TABLE(acpi, acpi_tad_ids);
690690

drivers/acpi/apei/einj-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ static struct platform_device *einj_dev;
880880
* triggering a section mismatch warning.
881881
*/
882882
static struct platform_driver einj_driver __refdata = {
883-
.remove_new = __exit_p(einj_remove),
883+
.remove = __exit_p(einj_remove),
884884
.driver = {
885885
.name = "acpi-einj",
886886
},

drivers/acpi/apei/ghes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ static struct platform_driver ghes_platform_driver = {
16051605
.name = "GHES",
16061606
},
16071607
.probe = ghes_probe,
1608-
.remove_new = ghes_remove,
1608+
.remove = ghes_remove,
16091609
};
16101610

16111611
void __init acpi_ghes_init(void)

drivers/acpi/arm64/agdi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static struct platform_driver agdi_driver = {
8888
.name = "agdi",
8989
},
9090
.probe = agdi_probe,
91-
.remove_new = agdi_remove,
91+
.remove = agdi_remove,
9292
};
9393

9494
void __init acpi_agdi_init(void)

drivers/acpi/dptf/dptf_pch_fivr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
158158

159159
static struct platform_driver pch_fivr_driver = {
160160
.probe = pch_fivr_add,
161-
.remove_new = pch_fivr_remove,
161+
.remove = pch_fivr_remove,
162162
.driver = {
163163
.name = "dptf_pch_fivr",
164164
.acpi_match_table = pch_fivr_device_ids,

drivers/acpi/dptf/dptf_power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ MODULE_DEVICE_TABLE(acpi, int3407_device_ids);
242242

243243
static struct platform_driver dptf_power_driver = {
244244
.probe = dptf_power_add,
245-
.remove_new = dptf_power_remove,
245+
.remove = dptf_power_remove,
246246
.driver = {
247247
.name = "dptf_power",
248248
.acpi_match_table = int3407_device_ids,

drivers/acpi/evged.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static const struct acpi_device_id ged_acpi_ids[] = {
185185

186186
static struct platform_driver ged_driver = {
187187
.probe = ged_probe,
188-
.remove_new = ged_remove,
188+
.remove = ged_remove,
189189
.shutdown = ged_shutdown,
190190
.driver = {
191191
.name = MODULE_NAME,

drivers/acpi/fan_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ static const struct dev_pm_ops acpi_fan_pm = {
448448

449449
static struct platform_driver acpi_fan_driver = {
450450
.probe = acpi_fan_probe,
451-
.remove_new = acpi_fan_remove,
451+
.remove = acpi_fan_remove,
452452
.driver = {
453453
.name = "acpi-fan",
454454
.acpi_match_table = fan_device_ids,

0 commit comments

Comments
 (0)