Commit cdccaab0 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Borislav Petkov (AMD)
Browse files

x86/platform: Switch back to struct platform_driver::remove() 



After

  0edb555a ("platform: Make platform_driver::remove() return void")

.remove() is (again) the right callback to implement for platform drivers.

Convert all platform drivers below arch/x86 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>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20241021103954.403577-2-u.kleine-koenig@baylibre.com
parent 42f7652d

arch/x86/platform/iris/iris.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static struct platform_driver iris_driver = { 
		.name   = "iris",

	},

	.probe          = iris_probe,

	.remove_new     = iris_remove,

	.remove         = iris_remove,

};



static struct resource iris_resources[] = {

arch/x86/platform/olpc/olpc-xo1-pm.c

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static struct platform_driver cs5535_pms_driver = { 
		.name = "cs5535-pms",

	},

	.probe = xo1_pm_probe,

	.remove_new = xo1_pm_remove,

	.remove = xo1_pm_remove,

};



static struct platform_driver cs5535_acpi_driver = {
@@ -167,7 +167,7 @@ static struct platform_driver cs5535_acpi_driver = { 
		.name = "olpc-xo1-pm-acpi",

	},

	.probe = xo1_pm_probe,

	.remove_new = xo1_pm_remove,

	.remove = xo1_pm_remove,

};



static int __init xo1_pm_init(void)

arch/x86/platform/olpc/olpc-xo1-sci.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static struct platform_driver xo1_sci_driver = { 
		.dev_groups = lid_groups,

	},

	.probe = xo1_sci_probe,

	.remove_new = xo1_sci_remove,

	.remove = xo1_sci_remove,

	.suspend = xo1_sci_suspend,

	.resume = xo1_sci_resume,

};