Skip to content

Commit cdccaab

Browse files
ukleinekbp3tk0v
authored andcommitted
x86/platform: Switch back to struct platform_driver::remove()
After 0edb555 ("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: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/20241021103954.403577-2-u.kleine-koenig@baylibre.com
1 parent 42f7652 commit cdccaab

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

arch/x86/platform/iris/iris.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static struct platform_driver iris_driver = {
7373
.name = "iris",
7474
},
7575
.probe = iris_probe,
76-
.remove_new = iris_remove,
76+
.remove = iris_remove,
7777
};
7878

7979
static struct resource iris_resources[] = {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,15 @@ static struct platform_driver cs5535_pms_driver = {
159159
.name = "cs5535-pms",
160160
},
161161
.probe = xo1_pm_probe,
162-
.remove_new = xo1_pm_remove,
162+
.remove = xo1_pm_remove,
163163
};
164164

165165
static struct platform_driver cs5535_acpi_driver = {
166166
.driver = {
167167
.name = "olpc-xo1-pm-acpi",
168168
},
169169
.probe = xo1_pm_probe,
170-
.remove_new = xo1_pm_remove,
170+
.remove = xo1_pm_remove,
171171
};
172172

173173
static int __init xo1_pm_init(void)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ static struct platform_driver xo1_sci_driver = {
616616
.dev_groups = lid_groups,
617617
},
618618
.probe = xo1_sci_probe,
619-
.remove_new = xo1_sci_remove,
619+
.remove = xo1_sci_remove,
620620
.suspend = xo1_sci_suspend,
621621
.resume = xo1_sci_resume,
622622
};

0 commit comments

Comments
 (0)