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

After commit 0edb555a65d1 ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/platform/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.

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241017073802.53235-2-u.kleine-koenig@baylibre.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index ae916a7a01cad8407fec7b7e6bb935a83cc22f6a..d09baa3d3d902ee31551dd4fbf2be374cbc0623c 100644 (file)
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -2636,7 +2636,7 @@ static struct platform_driver acer_platform_driver = {
                .pm = &acer_pm,
        },
        .probe = acer_platform_probe,
-       .remove_new = acer_platform_remove,
+       .remove = acer_platform_remove,
        .shutdown = acer_platform_shutdown,
 };
 

diff --git a/drivers/platform/x86/adv_swbutton.c b/drivers/platform/x86/adv_swbutton.c
index 6b23ba78e028f852721ee619f445b6fef9fb886f..6fa60f3fc53c0b0cfc4a2d27ead40e5b402b9b64 100644 (file)
--- a/drivers/platform/x86/adv_swbutton.c
+++ b/drivers/platform/x86/adv_swbutton.c
@@ -110,7 +110,7 @@ static struct platform_driver adv_swbutton_driver = {
                .acpi_match_table = button_device_ids,
        },
        .probe = adv_swbutton_probe,
-       .remove_new = adv_swbutton_remove,
+       .remove = adv_swbutton_remove,
 };
 module_platform_driver(adv_swbutton_driver);
 

diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index 8fcf38eed7f00ee01aade6e3e55e20402458d5aa..fe8948729bba9966e9e11036ef6a085ce50ff75b 100644 (file)
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -883,7 +883,7 @@ static void hsmp_pltdrv_remove(struct platform_device *pdev)
 
 static struct platform_driver amd_hsmp_driver = {
        .probe          = hsmp_pltdrv_probe,
-       .remove_new     = hsmp_pltdrv_remove,
+       .remove         = hsmp_pltdrv_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .acpi_match_table = amd_hsmp_acpi_ids,

diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c
index bbb8edb62e009f25a58dcf059151e52123d2448d..71abc6276e893b13d4356a808de806cab5165391 100644 (file)
--- a/drivers/platform/x86/amd/pmc/pmc.c
+++ b/drivers/platform/x86/amd/pmc/pmc.c
@@ -1156,7 +1156,7 @@ static struct platform_driver amd_pmc_driver = {
                .pm = pm_sleep_ptr(&amd_pmc_pm),
        },
        .probe = amd_pmc_probe,
-       .remove_new = amd_pmc_remove,
+       .remove = amd_pmc_remove,
 };
 module_platform_driver(amd_pmc_driver);
 

diff --git a/drivers/platform/x86/amd/pmf/core.c b/drivers/platform/x86/amd/pmf/core.c
index d6af0ca036f17154750812bea54a61efde11196e..47126abd13ca00eaf89167d319d6fede44e83e90 100644 (file)
--- a/drivers/platform/x86/amd/pmf/core.c
+++ b/drivers/platform/x86/amd/pmf/core.c
@@ -496,7 +496,7 @@ static struct platform_driver amd_pmf_driver = {
                .pm = pm_sleep_ptr(&amd_pmf_pm),
        },
        .probe = amd_pmf_probe,
-       .remove_new = amd_pmf_remove,
+       .remove = amd_pmf_remove,
 };
 module_platform_driver(amd_pmf_driver);
 

diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c
index 2423dc91debb930504b9022176b13aa869f9e958..18397c527eab355ef30431fe026e5492ecbc6cf5 100644 (file)
--- a/drivers/platform/x86/amilo-rfkill.c
+++ b/drivers/platform/x86/amilo-rfkill.c
@@ -132,10 +132,10 @@ static void amilo_rfkill_remove(struct platform_device *device)
 
 static struct platform_driver amilo_rfkill_driver = {
        .driver = {
-               .name   = KBUILD_MODNAME,
+               .name = KBUILD_MODNAME,
        },
-       .probe  = amilo_rfkill_probe,
-       .remove_new = amilo_rfkill_remove,
+       .probe = amilo_rfkill_probe,
+       .remove = amilo_rfkill_remove,
 };
 
 static int __init amilo_rfkill_init(void)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 7a48220b4f5a66f4d188af4fdfb5301a8f902f41..2ccc23b259d3e6d4142d079594a0e6c2e67b17ba 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -5066,7 +5066,7 @@ int __init_or_module asus_wmi_register_driver(struct asus_wmi_driver *driver)
                return -EBUSY;
 
        platform_driver = &driver->platform_driver;
-       platform_driver->remove_new = asus_wmi_remove;
+       platform_driver->remove = asus_wmi_remove;
        platform_driver->driver.owner = driver->owner;
        platform_driver->driver.name = driver->name;
        platform_driver->driver.pm = &asus_pm_ops;

diff --git a/drivers/platform/x86/barco-p50-gpio.c b/drivers/platform/x86/barco-p50-gpio.c
index af566f712057791fb3c186df1582c28961623ae4..143d14548565fc4b87ad467f86abefb505fa761f 100644 (file)
--- a/drivers/platform/x86/barco-p50-gpio.c
+++ b/drivers/platform/x86/barco-p50-gpio.c
@@ -385,7 +385,7 @@ static struct platform_driver p50_gpio_driver = {
                .name = DRIVER_NAME,
        },
        .probe = p50_gpio_probe,
-       .remove_new = p50_gpio_remove,
+       .remove = p50_gpio_remove,
 };
 
 /* Board setup */

diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 5546fb1894913066f6618a856f081c11a7b70e9c..4e1d44670bd101c5211119330d51d4d377fc9fc7 100644 (file)
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -1023,8 +1023,8 @@ static struct platform_driver compal_driver = {
        .driver = {
                .name = DRIVER_NAME,
        },
-       .probe  = compal_probe,
-       .remove_new = compal_remove,
+       .probe = compal_probe,
+       .remove = compal_remove,
 };
 
 static int __init compal_init(void)

diff --git a/drivers/platform/x86/dell/dcdbas.c b/drivers/platform/x86/dell/dcdbas.c
index a60e350563875f6b8ac14fbdfdbe143a0414b700..c7dcb5d2dc77c5ed91c50957f43919f289598036 100644 (file)
--- a/drivers/platform/x86/dell/dcdbas.c
+++ b/drivers/platform/x86/dell/dcdbas.c
@@ -709,7 +709,7 @@ static struct platform_driver dcdbas_driver = {
                .name   = DRIVER_NAME,
        },
        .probe          = dcdbas_probe,
-       .remove_new     = dcdbas_remove,
+       .remove         = dcdbas_remove,
 };
 
 static const struct platform_device_info dcdbas_dev_info __initconst = {

diff --git a/drivers/platform/x86/dell/dell-smo8800.c b/drivers/platform/x86/dell/dell-smo8800.c
index f7ec17c5683321885f35a88c7cf99b1b774c43aa..87fe03f23f24090ef5148334a43ecdedb26548ef 100644 (file)
--- a/drivers/platform/x86/dell/dell-smo8800.c
+++ b/drivers/platform/x86/dell/dell-smo8800.c
@@ -179,7 +179,7 @@ MODULE_DEVICE_TABLE(acpi, smo8800_ids);
 
 static struct platform_driver smo8800_driver = {
        .probe = smo8800_probe,
-       .remove_new = smo8800_remove,
+       .remove = smo8800_remove,
        .driver = {
                .name = DRIVER_NAME,
                .acpi_match_table = smo8800_ids,

diff --git a/drivers/platform/x86/dell/dell-uart-backlight.c b/drivers/platform/x86/dell/dell-uart-backlight.c
index 3995f90add4568b65d3edc0ac8b60a074d24bd97..6e5dc7e3674f5a2a4ab0948be76892dbac768985 100644 (file)
--- a/drivers/platform/x86/dell/dell-uart-backlight.c
+++ b/drivers/platform/x86/dell/dell-uart-backlight.c
@@ -393,7 +393,7 @@ static void dell_uart_bl_pdev_remove(struct platform_device *pdev)
 
 static struct platform_driver dell_uart_bl_pdev_driver = {
        .probe = dell_uart_bl_pdev_probe,
-       .remove_new = dell_uart_bl_pdev_remove,
+       .remove = dell_uart_bl_pdev_remove,
        .driver = {
                .name = "dell-uart-backlight",
        },

diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
index 8c05e0dd2a218e62bc7fd2dbf2a46067b4d20c67..81ccc96ffe40a3c0e3f3adee9cf0dabdf945534a 100644 (file)
--- a/drivers/platform/x86/hp/hp-wmi.c
+++ b/drivers/platform/x86/hp/hp-wmi.c
@@ -1748,7 +1748,7 @@ static struct platform_driver hp_wmi_driver __refdata = {
                .pm = &hp_wmi_pm_ops,
                .dev_groups = hp_wmi_groups,
        },
-       .remove_new = __exit_p(hp_wmi_bios_remove),
+       .remove = __exit_p(hp_wmi_bios_remove),
 };
 
 static umode_t hp_wmi_hwmon_is_visible(const void *data,

diff --git a/drivers/platform/x86/hp/hp_accel.c b/drivers/platform/x86/hp/hp_accel.c
index 52535576772ad8aad4fae3eccc0e8be8d0cffc68..39a6530f5072badcda3c911df111cfa054a8aa14 100644 (file)
--- a/drivers/platform/x86/hp/hp_accel.c
+++ b/drivers/platform/x86/hp/hp_accel.c
@@ -372,7 +372,7 @@ static SIMPLE_DEV_PM_OPS(hp_accel_pm, lis3lv02d_suspend, lis3lv02d_resume);
 /* For the HP MDPS aka 3D Driveguard */
 static struct platform_driver lis3lv02d_driver = {
        .probe  = lis3lv02d_probe,
-       .remove_new = lis3lv02d_remove,
+       .remove = lis3lv02d_remove,
        .driver = {
                .name   = "hp_accel",
                .pm     = &hp_accel_pm,

diff --git a/drivers/platform/x86/hp/tc1100-wmi.c b/drivers/platform/x86/hp/tc1100-wmi.c
index 5298b0f6804f019dc4d1ec949b13b3dfd8551f49..146716d8144234af8e678aa906bee79764ac8aba 100644 (file)
--- a/drivers/platform/x86/hp/tc1100-wmi.c
+++ b/drivers/platform/x86/hp/tc1100-wmi.c
@@ -221,7 +221,7 @@ static struct platform_driver tc1100_driver = {
                .pm = &tc1100_pm_ops,
 #endif
        },
-       .remove_new = tc1100_remove,
+       .remove = tc1100_remove,
 };
 
 static int __init tc1100_init(void)

diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
index d81fd5df4a000b4e20e12efb7c5da9d84f1e7bb2..c3772df34679f50abbaa7a173424ae1fa98717ba 100644 (file)
--- a/drivers/platform/x86/huawei-wmi.c
+++ b/drivers/platform/x86/huawei-wmi.c
@@ -842,7 +842,7 @@ static struct platform_driver huawei_wmi_driver = {
                .name = "huawei-wmi",
        },
        .probe = huawei_wmi_probe,
-       .remove_new = huawei_wmi_remove,
+       .remove = huawei_wmi_remove,
 };
 
 static __init int huawei_wmi_init(void)

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index c64dfc56651d3d172cebf1787d3db026a1061d09..9d8c3f064050e8a317acbb0bdd151808e9fe2bc1 100644 (file)
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -2306,7 +2306,7 @@ MODULE_DEVICE_TABLE(acpi, ideapad_device_ids);
 
 static struct platform_driver ideapad_acpi_driver = {
        .probe = ideapad_acpi_add,
-       .remove_new = ideapad_acpi_remove,
+       .remove = ideapad_acpi_remove,
        .driver = {
                .name   = "ideapad_acpi",
                .pm     = &ideapad_pm,

diff --git a/drivers/platform/x86/intel/bxtwc_tmu.c b/drivers/platform/x86/intel/bxtwc_tmu.c
index d0e2a3c293b0b0e9da1be3caa52cc9275df4b468..1aabd15e271489384593a8e024aae927b81ab7d1 100644 (file)
--- a/drivers/platform/x86/intel/bxtwc_tmu.c
+++ b/drivers/platform/x86/intel/bxtwc_tmu.c
@@ -131,7 +131,7 @@ MODULE_DEVICE_TABLE(platform, bxt_wcove_tmu_id_table);
 
 static struct platform_driver bxt_wcove_tmu_driver = {
        .probe = bxt_wcove_tmu_probe,
-       .remove_new = bxt_wcove_tmu_remove,
+       .remove = bxt_wcove_tmu_remove,
        .driver = {
                .name = "bxt_wcove_tmu",
                .pm     = &bxtwc_tmu_pm_ops,

diff --git a/drivers/platform/x86/intel/bytcrc_pwrsrc.c b/drivers/platform/x86/intel/bytcrc_pwrsrc.c
index 418b71af27ff529953336aafac23d84c47f28c77..3edc2a9dab388d26175eb855855754e6563c9f2a 100644 (file)
--- a/drivers/platform/x86/intel/bytcrc_pwrsrc.c
+++ b/drivers/platform/x86/intel/bytcrc_pwrsrc.c
@@ -167,7 +167,7 @@ static void crc_pwrsrc_remove(struct platform_device *pdev)
 
 static struct platform_driver crc_pwrsrc_driver = {
        .probe = crc_pwrsrc_probe,
-       .remove_new = crc_pwrsrc_remove,
+       .remove = crc_pwrsrc_remove,
        .driver = {
                .name = "crystal_cove_pwrsrc",
        },

diff --git a/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c b/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c
index 615f8d1a0c687b58224e3822a2582131ff3b0537..53f01e19804728aae61eca5a9f9bd19f1f134d32 100644 (file)
--- a/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c
+++ b/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c
@@ -84,7 +84,7 @@ static struct platform_driver chtdc_ti_pwrbtn_driver = {
                .name   = KBUILD_MODNAME,
        },
        .probe          = chtdc_ti_pwrbtn_probe,
-       .remove_new     = chtdc_ti_pwrbtn_remove,
+       .remove         = chtdc_ti_pwrbtn_remove,
        .id_table       = chtdc_ti_pwrbtn_id_table,
 };
 module_platform_driver(chtdc_ti_pwrbtn_driver);

diff --git a/drivers/platform/x86/intel/chtwc_int33fe.c b/drivers/platform/x86/intel/chtwc_int33fe.c
index 11503b1c85f3fb7969842491e0249c74686406e3..29e8b5432f4c9eea7dc45b83d94c0e00373f901b 100644 (file)
--- a/drivers/platform/x86/intel/chtwc_int33fe.c
+++ b/drivers/platform/x86/intel/chtwc_int33fe.c
@@ -427,7 +427,7 @@ static struct platform_driver cht_int33fe_typec_driver = {
                .acpi_match_table = ACPI_PTR(cht_int33fe_acpi_ids),
        },
        .probe = cht_int33fe_typec_probe,
-       .remove_new = cht_int33fe_typec_remove,
+       .remove = cht_int33fe_typec_remove,
 };
 
 module_platform_driver(cht_int33fe_typec_driver);

diff --git a/drivers/platform/x86/intel/hid.c b/drivers/platform/x86/intel/hid.c
index 445e7a59beb414ca2046591f0220c0231f14e14b..97174834dc31bc7ebcd5cd73a66c523544eafaad 100644 (file)
--- a/drivers/platform/x86/intel/hid.c
+++ b/drivers/platform/x86/intel/hid.c
@@ -747,7 +747,7 @@ static struct platform_driver intel_hid_pl_driver = {
                .pm = &intel_hid_pl_pm_ops,
        },
        .probe = intel_hid_probe,
-       .remove_new = intel_hid_remove,
+       .remove = intel_hid_remove,
 };
 
 /*

diff --git a/drivers/platform/x86/intel/int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c
index 527d8fbc7cc1108da998e86d0d8dd970d9c5b179..0cc80603a8a9dc29d07777b22315617cb7119acd 100644 (file)
--- a/drivers/platform/x86/intel/int0002_vgpio.c
+++ b/drivers/platform/x86/intel/int0002_vgpio.c
@@ -266,13 +266,13 @@ static const struct acpi_device_id int0002_acpi_ids[] = {
 MODULE_DEVICE_TABLE(acpi, int0002_acpi_ids);
 
 static struct platform_driver int0002_driver = {
-       .driver = {
+       .driver = {
                .name                   = DRV_NAME,
                .acpi_match_table       = int0002_acpi_ids,
                .pm                     = &int0002_pm_ops,
        },
        .probe  = int0002_probe,
-       .remove_new = int0002_remove,
+       .remove = int0002_remove,
 };
 
 module_platform_driver(int0002_driver);

diff --git a/drivers/platform/x86/intel/int1092/intel_sar.c b/drivers/platform/x86/intel/int1092/intel_sar.c
index 6246c066ade2bc4167f1bb83a06546f4f3767ceb..e526841aff603bbffa61d5dea5aa4ab3a692d7da 100644 (file)
--- a/drivers/platform/x86/intel/int1092/intel_sar.c
+++ b/drivers/platform/x86/intel/int1092/intel_sar.c
@@ -308,7 +308,7 @@ static void sar_remove(struct platform_device *device)
 
 static struct platform_driver sar_driver = {
        .probe = sar_probe,
-       .remove_new = sar_remove,
+       .remove = sar_remove,
        .driver = {
                .name = DRVNAME,
                .acpi_match_table = ACPI_PTR(sar_device_ids)

diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
index 3de463c3d13b8e12bae1109c090ea14134707cb6..d881b2cfcdfcfbd079b749c7a8bf4f183e0eace4 100644 (file)
--- a/drivers/platform/x86/intel/int3472/discrete.c
+++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -392,7 +392,7 @@ static struct platform_driver int3472_discrete = {
                .acpi_match_table = int3472_device_id,
        },
        .probe = skl_int3472_discrete_probe,
-       .remove_new = skl_int3472_discrete_remove,
+       .remove = skl_int3472_discrete_remove,
 };
 module_platform_driver(int3472_discrete);
 

diff --git a/drivers/platform/x86/intel/mrfld_pwrbtn.c b/drivers/platform/x86/intel/mrfld_pwrbtn.c
index 549a3f586f3bcf3c1f63ccb5e1c42d669d9e0a6d..6c43f801c4673f3ea5e2399cba810804ed053976 100644 (file)
--- a/drivers/platform/x86/intel/mrfld_pwrbtn.c
+++ b/drivers/platform/x86/intel/mrfld_pwrbtn.c
@@ -97,7 +97,7 @@ static struct platform_driver mrfld_pwrbtn_driver = {
                .name   = "mrfld_bcove_pwrbtn",
        },
        .probe          = mrfld_pwrbtn_probe,
-       .remove_new     = mrfld_pwrbtn_remove,
+       .remove         = mrfld_pwrbtn_remove,
        .id_table       = mrfld_pwrbtn_id_table,
 };
 module_platform_driver(mrfld_pwrbtn_driver);

diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index ecb47f8b4f834dd9df622ec37b596a85dc0ff26f..c43c206dab31abc1db111445f8518e45509b8508 100644 (file)
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -1722,7 +1722,7 @@ static struct platform_driver pmc_core_driver = {
                .dev_groups = pmc_dev_groups,
        },
        .probe = pmc_core_probe,
-       .remove_new = pmc_core_remove,
+       .remove = pmc_core_remove,
 };
 
 module_platform_driver(pmc_core_driver);

diff --git a/drivers/platform/x86/intel/telemetry/pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c
index 767a0bc6c7ad578d49ed6ff0119611cc38f564ad..9a499efa1e4d5b313ebf61953964e63f6c1c503a 100644 (file)
--- a/drivers/platform/x86/intel/telemetry/pltdrv.c
+++ b/drivers/platform/x86/intel/telemetry/pltdrv.c
@@ -1163,7 +1163,7 @@ static void telemetry_pltdrv_remove(struct platform_device *pdev)
 
 static struct platform_driver telemetry_soc_driver = {
        .probe          = telemetry_pltdrv_probe,
-       .remove_new     = telemetry_pltdrv_remove,
+       .remove         = telemetry_pltdrv_remove,
        .driver         = {
                .name   = DRIVER_NAME,
        },

diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel/vbtn.c
index a353e830b65fd1c3f2082aa2950a608895592873..232cd12e3c9fabbd3f9e4f90b115b2440406a1f5 100644 (file)
--- a/drivers/platform/x86/intel/vbtn.c
+++ b/drivers/platform/x86/intel/vbtn.c
@@ -387,7 +387,7 @@ static struct platform_driver intel_vbtn_pl_driver = {
                .pm = &intel_vbtn_pm_ops,
        },
        .probe = intel_vbtn_probe,
-       .remove_new = intel_vbtn_remove,
+       .remove = intel_vbtn_remove,
 };
 
 static acpi_status __init

diff --git a/drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c b/drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c
index d525bdc8ca9b3f8732e8878d8f9c6cf0050157bd..d2699ca24f340d06128b3ec8bf4170cb153d5a68 100644 (file)
--- a/drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c
+++ b/drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c
@@ -298,7 +298,7 @@ static void yt2_1380_fc_pdev_remove(struct platform_device *pdev)
 
 static struct platform_driver yt2_1380_fc_pdev_driver = {
        .probe = yt2_1380_fc_pdev_probe,
-       .remove_new = yt2_1380_fc_pdev_remove,
+       .remove = yt2_1380_fc_pdev_remove,
        .driver = {
                .name = YT2_1380_FC_PDEV_NAME,
                .probe_type = PROBE_PREFER_ASYNCHRONOUS,

diff --git a/drivers/platform/x86/lenovo-yogabook.c b/drivers/platform/x86/lenovo-yogabook.c
index fd62bf746ebde47d9524d6104b8309d8842f093f..31b298dc5046f810775a98585cfced0ee0fb8e29 100644 (file)
--- a/drivers/platform/x86/lenovo-yogabook.c
+++ b/drivers/platform/x86/lenovo-yogabook.c
@@ -536,7 +536,7 @@ static void yogabook_pdev_remove(struct platform_device *pdev)
 
 static struct platform_driver yogabook_pdev_driver = {
        .probe = yogabook_pdev_probe,
-       .remove_new = yogabook_pdev_remove,
+       .remove = yogabook_pdev_remove,
        .driver = {
                .name = YB_PDEV_NAME,
                .pm = pm_sleep_ptr(&yogabook_pm_ops),

diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
index 9d70146fd7420a1f6bb07e42fdc65bf694ed9851..671021cd1f59854dad3f302a2a97d510bd484f36 100644 (file)
--- a/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@ -6633,7 +6633,7 @@ static struct platform_driver mlxplat_driver = {
                .probe_type = PROBE_FORCE_SYNCHRONOUS,
        },
        .probe          = mlxplat_probe,
-       .remove_new     = mlxplat_remove,
+       .remove         = mlxplat_remove,
 };
 
 static int __init mlxplat_init(void)

diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
index 134e2c3d91ca9bdd025ffc2fc00dc78e49196e79..8160d45f8a2391b4b46ed53a5c98a73bef9b808e 100644 (file)
--- a/drivers/platform/x86/samsung-q10.c
+++ b/drivers/platform/x86/samsung-q10.c
@@ -78,7 +78,7 @@ static struct platform_driver samsungq10_driver = {
                .name   = KBUILD_MODNAME,
        },
        .probe          = samsungq10_probe,
-       .remove_new     = samsungq10_remove,
+       .remove         = samsungq10_remove,
 };
 
 static struct platform_device *samsungq10_device;

diff --git a/drivers/platform/x86/sel3350-platform.c b/drivers/platform/x86/sel3350-platform.c
index d09e976e71483203e7e443114827660ece987e95..02e2081e2333b1495035f43db50ad9ed7e1099c8 100644 (file)
--- a/drivers/platform/x86/sel3350-platform.c
+++ b/drivers/platform/x86/sel3350-platform.c
@@ -235,7 +235,7 @@ MODULE_DEVICE_TABLE(acpi, sel3350_device_ids);
 
 static struct platform_driver sel3350_platform_driver = {
        .probe = sel3350_probe,
-       .remove_new = sel3350_remove,
+       .remove = sel3350_remove,
        .driver = {
                .name = "sel3350-platform",
                .acpi_match_table = sel3350_device_ids,

diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c
index 7c04cc9e5891be201cf8d43b2e67cca86b9fb0a4..ed6b28505cd66f8ce82983c586bf399425fbba9e 100644 (file)
--- a/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@ -409,7 +409,7 @@ static struct platform_driver smi_driver = {
                .acpi_match_table = smi_acpi_ids,
        },
        .probe = smi_probe,
-       .remove_new = smi_remove,
+       .remove = smi_remove,
 };
 module_platform_driver(smi_driver);
 

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
index 5edc294de6e4adf6c8d88a6231aca5838a3e6a43..6ff6f3de492b99346f31e0e3fb165b51e36fde51 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c
@@ -37,7 +37,7 @@ static int simatic_ipc_batt_apollolake_probe(struct platform_device *pdev)
 
 static struct platform_driver simatic_ipc_batt_driver = {
        .probe = simatic_ipc_batt_apollolake_probe,
-       .remove_new = simatic_ipc_batt_apollolake_remove,
+       .remove = simatic_ipc_batt_apollolake_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c b/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
index e6a56d14b505ccc1fe20c67dccddb096bf13529c..83f532498c8c77aef8e5f5fb46b720bd96f823e1 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c
@@ -37,7 +37,7 @@ static int simatic_ipc_batt_elkhartlake_probe(struct platform_device *pdev)
 
 static struct platform_driver simatic_ipc_batt_driver = {
        .probe = simatic_ipc_batt_elkhartlake_probe,
-       .remove_new = simatic_ipc_batt_elkhartlake_remove,
+       .remove = simatic_ipc_batt_elkhartlake_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c b/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
index f8849d0e48a8466ce508c3a3a2cd3c78ec202ca7..c6a79338f1d0d901f6d04c5074e6e661ab51b13c 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c
@@ -73,7 +73,7 @@ static int simatic_ipc_batt_f7188x_probe(struct platform_device *pdev)
 
 static struct platform_driver simatic_ipc_batt_driver = {
        .probe = simatic_ipc_batt_f7188x_probe,
-       .remove_new = simatic_ipc_batt_f7188x_remove,
+       .remove = simatic_ipc_batt_f7188x_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },

diff --git a/drivers/platform/x86/siemens/simatic-ipc-batt.c b/drivers/platform/x86/siemens/simatic-ipc-batt.c
index d9aff10608cf2847715adb3332c41e440ab61e81..7cfe991cba0040d46890e5abba407546a463c35c 100644 (file)
--- a/drivers/platform/x86/siemens/simatic-ipc-batt.c
+++ b/drivers/platform/x86/siemens/simatic-ipc-batt.c
@@ -239,7 +239,7 @@ static int simatic_ipc_batt_io_probe(struct platform_device *pdev)
 
 static struct platform_driver simatic_ipc_batt_driver = {
        .probe = simatic_ipc_batt_io_probe,
-       .remove_new = simatic_ipc_batt_io_remove,
+       .remove = simatic_ipc_batt_io_remove,
        .driver = {
                .name = KBUILD_MODNAME,
        },

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index a01223c23d10efa21e0244398441893064b73eed..2d6885c67ac0f6f441012a46a6b50ba79aa6a919 100644 (file)
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1328,7 +1328,7 @@ static struct platform_driver acpi_wmi_driver = {
                .acpi_match_table = wmi_device_ids,
        },
        .probe = acpi_wmi_probe,
-       .remove_new = acpi_wmi_remove,
+       .remove = acpi_wmi_remove,
 };
 
 static int __init acpi_wmi_init(void)

diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c
index 1427a9a3900855a822cded14c87af2dc46a6c467..30dd845b543e29f3262d3ae80cbc302bb37f2509 100644 (file)
--- a/drivers/platform/x86/x86-android-tablets/core.c
+++ b/drivers/platform/x86/x86-android-tablets/core.c
@@ -456,7 +456,7 @@ static struct platform_driver x86_android_tablet_driver = {
        .driver = {
                .name = KBUILD_MODNAME,
        },
-       .remove_new = x86_android_tablet_remove,
+       .remove = x86_android_tablet_remove,
 };
 
 static int __init x86_android_tablet_init(void)

diff --git a/drivers/platform/x86/xo1-rfkill.c b/drivers/platform/x86/xo1-rfkill.c
index 5fe68296501c44098ce4d164168d136127a2bab5..5fedb99b9d944cfb670ff3cce1d72e3ada22fe81 100644 (file)
--- a/drivers/platform/x86/xo1-rfkill.c
+++ b/drivers/platform/x86/xo1-rfkill.c
@@ -68,7 +68,7 @@ static struct platform_driver xo1_rfkill_driver = {
                .name = "xo1-rfkill",
        },
        .probe          = xo1_rfkill_probe,
-       .remove_new     = xo1_rfkill_remove,
+       .remove         = xo1_rfkill_remove,
 };
 
 module_platform_driver(xo1_rfkill_driver);