Commit 927df4ca authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Rafael J. Wysocki
Browse files

ACPI: Switch back to struct platform_driver::remove() 



After commit 0edb555a ("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: default avatarUwe 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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 107d55ef

drivers/acpi/ac.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/acpi/acpi_pad.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

drivers/acpi/acpi_tad.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/acpi/apei/einj-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

	},

drivers/acpi/apei/ghes.c

+1 −1
Original line number Diff line number Diff line
@@ -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)