Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

After

0edb555a65d1 ("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

authored by

Uwe Kleine-König and committed by
Borislav Petkov (AMD)
cdccaab0 42f7652d

+4 -4
+1 -1
arch/x86/platform/iris/iris.c
··· 73 73 .name = "iris", 74 74 }, 75 75 .probe = iris_probe, 76 - .remove_new = iris_remove, 76 + .remove = iris_remove, 77 77 }; 78 78 79 79 static struct resource iris_resources[] = {
+2 -2
arch/x86/platform/olpc/olpc-xo1-pm.c
··· 159 159 .name = "cs5535-pms", 160 160 }, 161 161 .probe = xo1_pm_probe, 162 - .remove_new = xo1_pm_remove, 162 + .remove = xo1_pm_remove, 163 163 }; 164 164 165 165 static struct platform_driver cs5535_acpi_driver = { ··· 167 167 .name = "olpc-xo1-pm-acpi", 168 168 }, 169 169 .probe = xo1_pm_probe, 170 - .remove_new = xo1_pm_remove, 170 + .remove = xo1_pm_remove, 171 171 }; 172 172 173 173 static int __init xo1_pm_init(void)
+1 -1
arch/x86/platform/olpc/olpc-xo1-sci.c
··· 616 616 .dev_groups = lid_groups, 617 617 }, 618 618 .probe = xo1_sci_probe, 619 - .remove_new = xo1_sci_remove, 619 + .remove = xo1_sci_remove, 620 620 .suspend = xo1_sci_suspend, 621 621 .resume = xo1_sci_resume, 622 622 };