Input: 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/input/ 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 a few drivers.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241008090009.462836-2-u.kleine-koenig@baylibre.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/adp5520-keys.c b/drivers/input/keyboard/adp5520-keys.c
index 10c248f..980d739 100644 (file)
--- a/drivers/input/keyboard/adp5520-keys.c
+++ b/drivers/input/keyboard/adp5520-keys.c
@@ -181,7 +181,7 @@ static struct platform_driver adp5520_keys_driver = {
                .name   = "adp5520-keys",
        },
        .probe          = adp5520_keys_probe,
-       .remove_new     = adp5520_keys_remove,
+       .remove         = adp5520_keys_remove,
 };
 module_platform_driver(adp5520_keys_driver);
 

diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index 12eb9df..4219af6 100644 (file)
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -770,7 +770,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_keyb_pm_ops, NULL, cros_ec_keyb_resume);
 
 static struct platform_driver cros_ec_keyb_driver = {
        .probe = cros_ec_keyb_probe,
-       .remove_new = cros_ec_keyb_remove,
+       .remove = cros_ec_keyb_remove,
        .driver = {
                .name = "cros-ec-keyb",
                .dev_groups = cros_ec_keyb_groups,

diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index a8df957..144c735 100644 (file)
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -315,7 +315,7 @@ static struct platform_driver ep93xx_keypad_driver = {
                .pm     = pm_sleep_ptr(&ep93xx_keypad_pm_ops),
        },
        .probe          = ep93xx_keypad_probe,
-       .remove_new     = ep93xx_keypad_remove,
+       .remove         = ep93xx_keypad_remove,
 };
 module_platform_driver(ep93xx_keypad_driver);
 

diff --git a/drivers/input/keyboard/iqs62x-keys.c b/drivers/input/keyboard/iqs62x-keys.c
index 1315b0f..b086c7b 100644 (file)
--- a/drivers/input/keyboard/iqs62x-keys.c
+++ b/drivers/input/keyboard/iqs62x-keys.c
@@ -323,7 +323,7 @@ static struct platform_driver iqs62x_keys_platform_driver = {
                .name = "iqs62x-keys",
        },
        .probe = iqs62x_keys_probe,
-       .remove_new = iqs62x_keys_remove,
+       .remove = iqs62x_keys_remove,
 };
 module_platform_driver(iqs62x_keys_platform_driver);
 

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 5758754..33df888 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -290,7 +290,7 @@ static void omap_kp_remove(struct platform_device *pdev)
 
 static struct platform_driver omap_kp_driver = {
        .probe          = omap_kp_probe,
-       .remove_new     = omap_kp_remove,
+       .remove         = omap_kp_remove,
        .driver         = {
                .name   = "omap-keypad",
                .dev_groups = omap_kp_groups,

diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 935c2b2..bffe89c 100644 (file)
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -485,7 +485,7 @@ MODULE_DEVICE_TABLE(of, omap_keypad_dt_match);
 
 static struct platform_driver omap4_keypad_driver = {
        .probe          = omap4_keypad_probe,
-       .remove_new     = omap4_keypad_remove,
+       .remove         = omap4_keypad_remove,
        .driver         = {
                .name   = "omap4-keypad",
                .of_match_table = omap_keypad_dt_match,

diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index e212eff..9f1049a 100644 (file)
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -587,7 +587,7 @@ MODULE_DEVICE_TABLE(platform, samsung_keypad_driver_ids);
 
 static struct platform_driver samsung_keypad_driver = {
        .probe          = samsung_keypad_probe,
-       .remove_new     = samsung_keypad_remove,
+       .remove         = samsung_keypad_remove,
        .driver         = {
                .name   = "samsung-keypad",
                .of_match_table = of_match_ptr(samsung_keypad_dt_match),

diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index 4ea4fd2..159f41e 100644 (file)
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -319,7 +319,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(sh_keysc_dev_pm_ops,
 
 static struct platform_driver sh_keysc_device_driver = {
        .probe          = sh_keysc_probe,
-       .remove_new     = sh_keysc_remove,
+       .remove         = sh_keysc_remove,
        .driver         = {
                .name   = "sh_keysc",
                .pm     = pm_sleep_ptr(&sh_keysc_dev_pm_ops),

diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c
index ef2f440..0acded4 100644 (file)
--- a/drivers/input/keyboard/stmpe-keypad.c
+++ b/drivers/input/keyboard/stmpe-keypad.c
@@ -414,7 +414,7 @@ static void stmpe_keypad_remove(struct platform_device *pdev)
 static struct platform_driver stmpe_keypad_driver = {
        .driver.name    = "stmpe-keypad",
        .probe          = stmpe_keypad_probe,
-       .remove_new     = stmpe_keypad_remove,
+       .remove         = stmpe_keypad_remove,
 };
 module_platform_driver(stmpe_keypad_driver);
 

diff --git a/drivers/input/misc/88pm80x_onkey.c b/drivers/input/misc/88pm80x_onkey.c
index 6477a41..9159b5f 100644 (file)
--- a/drivers/input/misc/88pm80x_onkey.c
+++ b/drivers/input/misc/88pm80x_onkey.c
@@ -141,7 +141,7 @@ static struct platform_driver pm80x_onkey_driver = {
                   .pm = &pm80x_onkey_pm_ops,
                   },
        .probe = pm80x_onkey_probe,
-       .remove_new = pm80x_onkey_remove,
+       .remove = pm80x_onkey_remove,
 };
 
 module_platform_driver(pm80x_onkey_driver);

diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
index 7a1122e..cc23625 100644 (file)
--- a/drivers/input/misc/da9052_onkey.c
+++ b/drivers/input/misc/da9052_onkey.c
@@ -140,8 +140,8 @@ static void da9052_onkey_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_onkey_driver = {
        .probe  = da9052_onkey_probe,
-       .remove_new = da9052_onkey_remove,
-       .driver = {
+       .remove = da9052_onkey_remove,
+       .driver = {
                .name   = "da9052-onkey",
        },
 };

diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c
index 871812f..3e4fc2f 100644 (file)
--- a/drivers/input/misc/da9055_onkey.c
+++ b/drivers/input/misc/da9055_onkey.c
@@ -145,8 +145,8 @@ static void da9055_onkey_remove(struct platform_device *pdev)
 
 static struct platform_driver da9055_onkey_driver = {
        .probe  = da9055_onkey_probe,
-       .remove_new = da9055_onkey_remove,
-       .driver = {
+       .remove = da9055_onkey_remove,
+       .driver = {
                .name   = "da9055-onkey",
        },
 };

diff --git a/drivers/input/misc/ideapad_slidebar.c b/drivers/input/misc/ideapad_slidebar.c
index fea4a89..f6e5fc8 100644 (file)
--- a/drivers/input/misc/ideapad_slidebar.c
+++ b/drivers/input/misc/ideapad_slidebar.c
@@ -255,7 +255,7 @@ static struct platform_driver slidebar_drv = {
        .driver = {
                .name = "ideapad_slidebar",
        },
-       .remove_new = ideapad_remove,
+       .remove = ideapad_remove,
 };
 
 static int __init ideapad_dmi_check(const struct dmi_system_id *id)

diff --git a/drivers/input/misc/m68kspkr.c b/drivers/input/misc/m68kspkr.c
index 3fe0a85..0542334 100644 (file)
--- a/drivers/input/misc/m68kspkr.c
+++ b/drivers/input/misc/m68kspkr.c
@@ -95,7 +95,7 @@ static struct platform_driver m68kspkr_platform_driver = {
                .name   = "m68kspkr",
        },
        .probe          = m68kspkr_probe,
-       .remove_new     = m68kspkr_remove,
+       .remove         = m68kspkr_remove,
        .shutdown       = m68kspkr_shutdown,
 };
 

diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c
index 2853455..f97f341 100644 (file)
--- a/drivers/input/misc/max8997_haptic.c
+++ b/drivers/input/misc/max8997_haptic.c
@@ -384,7 +384,7 @@ static struct platform_driver max8997_haptic_driver = {
                .pm     = pm_sleep_ptr(&max8997_haptic_pm_ops),
        },
        .probe          = max8997_haptic_probe,
-       .remove_new     = max8997_haptic_remove,
+       .remove         = max8997_haptic_remove,
        .id_table       = max8997_haptic_id,
 };
 module_platform_driver(max8997_haptic_driver);

diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c
index 1c8c939..1c7faa9 100644 (file)
--- a/drivers/input/misc/mc13783-pwrbutton.c
+++ b/drivers/input/misc/mc13783-pwrbutton.c
@@ -253,7 +253,7 @@ static void mc13783_pwrbutton_remove(struct platform_device *pdev)
 
 static struct platform_driver mc13783_pwrbutton_driver = {
        .probe          = mc13783_pwrbutton_probe,
-       .remove_new     = mc13783_pwrbutton_remove,
+       .remove         = mc13783_pwrbutton_remove,
        .driver         = {
                .name   = "mc13783-pwrbutton",
        },

diff --git a/drivers/input/misc/palmas-pwrbutton.c b/drivers/input/misc/palmas-pwrbutton.c
index 06d5972..39fc451 100644 (file)
--- a/drivers/input/misc/palmas-pwrbutton.c
+++ b/drivers/input/misc/palmas-pwrbutton.c
@@ -310,7 +310,7 @@ MODULE_DEVICE_TABLE(of, of_palmas_pwr_match);
 
 static struct platform_driver palmas_pwron_driver = {
        .probe  = palmas_pwron_probe,
-       .remove_new = palmas_pwron_remove,
+       .remove = palmas_pwron_remove,
        .driver = {
                .name   = "palmas_pwrbutton",
                .of_match_table = of_match_ptr(of_palmas_pwr_match),

diff --git a/drivers/input/misc/pcap_keys.c b/drivers/input/misc/pcap_keys.c
index f8954a2..fe43fd7 100644 (file)
--- a/drivers/input/misc/pcap_keys.c
+++ b/drivers/input/misc/pcap_keys.c
@@ -112,7 +112,7 @@ static void pcap_keys_remove(struct platform_device *pdev)
 
 static struct platform_driver pcap_keys_device_driver = {
        .probe          = pcap_keys_probe,
-       .remove_new     = pcap_keys_remove,
+       .remove         = pcap_keys_remove,
        .driver         = {
                .name   = "pcap-keys",
        }

diff --git a/drivers/input/misc/pcf50633-input.c b/drivers/input/misc/pcf50633-input.c
index c5c5fe2..6d046e2 100644 (file)
--- a/drivers/input/misc/pcf50633-input.c
+++ b/drivers/input/misc/pcf50633-input.c
@@ -103,7 +103,7 @@ static struct platform_driver pcf50633_input_driver = {
                .name = "pcf50633-input",
        },
        .probe = pcf50633_input_probe,
-       .remove_new = pcf50633_input_remove,
+       .remove = pcf50633_input_remove,
 };
 module_platform_driver(pcf50633_input_driver);
 

diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 897854f..0467808 100644 (file)
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -127,7 +127,7 @@ static struct platform_driver pcspkr_platform_driver = {
                .pm     = &pcspkr_pm_ops,
        },
        .probe          = pcspkr_probe,
-       .remove_new     = pcspkr_remove,
+       .remove         = pcspkr_remove,
        .shutdown       = pcspkr_shutdown,
 };
 module_platform_driver(pcspkr_platform_driver);

diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c
index bab7100..d0c4666 100644 (file)
--- a/drivers/input/misc/pm8941-pwrkey.c
+++ b/drivers/input/misc/pm8941-pwrkey.c
@@ -465,7 +465,7 @@ MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table);
 
 static struct platform_driver pm8941_pwrkey_driver = {
        .probe = pm8941_pwrkey_probe,
-       .remove_new = pm8941_pwrkey_remove,
+       .remove = pm8941_pwrkey_remove,
        .driver = {
                .name = "pm8941-pwrkey",
                .pm = pm_sleep_ptr(&pm8941_pwr_key_pm_ops),

diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index e8f3737..b8cad41 100644 (file)
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c
@@ -612,7 +612,7 @@ MODULE_DEVICE_TABLE(acpi, soc_button_acpi_match);
 
 static struct platform_driver soc_button_driver = {
        .probe          = soc_button_probe,
-       .remove_new     = soc_button_remove,
+       .remove         = soc_button_remove,
        .driver         = {
                .name = KBUILD_MODNAME,
                .acpi_match_table = ACPI_PTR(soc_button_acpi_match),

diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 5de59ae..ff7b629 100644 (file)
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -256,7 +256,7 @@ static struct platform_driver bbc_beep_driver = {
                .of_match_table = bbc_beep_match,
        },
        .probe          = bbc_beep_probe,
-       .remove_new     = bbc_remove,
+       .remove         = bbc_remove,
        .shutdown       = sparcspkr_shutdown,
 };
 
@@ -334,7 +334,7 @@ static struct platform_driver grover_beep_driver = {
                .of_match_table = grover_beep_match,
        },
        .probe          = grover_beep_probe,
-       .remove_new     = grover_remove,
+       .remove         = grover_remove,
        .shutdown       = sparcspkr_shutdown,
 };
 

diff --git a/drivers/input/misc/tps65219-pwrbutton.c b/drivers/input/misc/tps65219-pwrbutton.c
index eeb9f23..7a58bae 100644 (file)
--- a/drivers/input/misc/tps65219-pwrbutton.c
+++ b/drivers/input/misc/tps65219-pwrbutton.c
@@ -137,7 +137,7 @@ MODULE_DEVICE_TABLE(platform, tps65219_pwrbtn_id_table);
 
 static struct platform_driver tps65219_pb_driver = {
        .probe = tps65219_pb_probe,
-       .remove_new = tps65219_pb_remove,
+       .remove = tps65219_pb_remove,
        .driver = {
                .name = "tps65219_pwrbutton",
        },

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 5c28ef4..69626e3 100644 (file)
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -1334,7 +1334,7 @@ static struct platform_driver wistron_driver = {
                .pm     = pm_sleep_ptr(&wistron_pm_ops),
        },
        .probe          = wistron_probe,
-       .remove_new     = wistron_remove,
+       .remove         = wistron_remove,
 };
 
 static int __init wb_module_init(void)

diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c
index e4a06c7..18eb319 100644 (file)
--- a/drivers/input/misc/wm831x-on.c
+++ b/drivers/input/misc/wm831x-on.c
@@ -134,7 +134,7 @@ static void wm831x_on_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_on_driver = {
        .probe          = wm831x_on_probe,
-       .remove_new     = wm831x_on_remove,
+       .remove         = wm831x_on_remove,
        .driver         = {
                .name   = "wm831x-on",
        },

diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c
index 2fbbaeb..d203c2a 100644 (file)
--- a/drivers/input/mouse/amimouse.c
+++ b/drivers/input/mouse/amimouse.c
@@ -139,7 +139,7 @@ static void __exit amimouse_remove(struct platform_device *pdev)
  * triggering a section mismatch warning.
  */
 static struct platform_driver amimouse_driver __refdata = {
-       .remove_new = __exit_p(amimouse_remove),
+       .remove = __exit_p(amimouse_remove),
        .driver   = {
                .name   = "amiga-mouse",
        },

diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c
index 611eb9f..aa445b1 100644 (file)
--- a/drivers/input/serio/altera_ps2.c
+++ b/drivers/input/serio/altera_ps2.c
@@ -146,7 +146,7 @@ MODULE_DEVICE_TABLE(of, altera_ps2_match);
  */
 static struct platform_driver altera_ps2_driver = {
        .probe          = altera_ps2_probe,
-       .remove_new     = altera_ps2_remove,
+       .remove         = altera_ps2_remove,
        .driver = {
                .name   = DRV_NAME,
                .of_match_table = of_match_ptr(altera_ps2_match),

diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
index 0bd6ae1..81b3a05 100644 (file)
--- a/drivers/input/serio/ams_delta_serio.c
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -182,7 +182,7 @@ static void ams_delta_serio_exit(struct platform_device *pdev)
 
 static struct platform_driver ams_delta_serio_driver = {
        .probe  = ams_delta_serio_init,
-       .remove_new = ams_delta_serio_exit,
+       .remove = ams_delta_serio_exit,
        .driver = {
                .name   = DRIVER_NAME
        },

diff --git a/drivers/input/serio/apbps2.c b/drivers/input/serio/apbps2.c
index 4015e75..b815337 100644 (file)
--- a/drivers/input/serio/apbps2.c
+++ b/drivers/input/serio/apbps2.c
@@ -208,7 +208,7 @@ static struct platform_driver apbps2_of_driver = {
                .of_match_table = apbps2_of_match,
        },
        .probe = apbps2_of_probe,
-       .remove_new = apbps2_of_remove,
+       .remove = apbps2_of_remove,
 };
 
 module_platform_driver(apbps2_of_driver);

diff --git a/drivers/input/serio/arc_ps2.c b/drivers/input/serio/arc_ps2.c
index a9180a0..e991c72 100644 (file)
--- a/drivers/input/serio/arc_ps2.c
+++ b/drivers/input/serio/arc_ps2.c
@@ -260,7 +260,7 @@ static struct platform_driver arc_ps2_driver = {
                .of_match_table = of_match_ptr(arc_ps2_match),
        },
        .probe  = arc_ps2_probe,
-       .remove_new = arc_ps2_remove,
+       .remove = arc_ps2_remove,
 };
 
 module_platform_driver(arc_ps2_driver);

diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c
index 6834440..053a159 100644 (file)
--- a/drivers/input/serio/ct82c710.c
+++ b/drivers/input/serio/ct82c710.c
@@ -190,7 +190,7 @@ static struct platform_driver ct82c710_driver = {
                .name   = "ct82c710",
        },
        .probe          = ct82c710_probe,
-       .remove_new     = ct82c710_remove,
+       .remove         = ct82c710_remove,
 };
 
 

diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index c2fda54..b4a5fca 100644 (file)
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -101,7 +101,7 @@ static struct platform_driver sparc_i8042_driver = {
                .of_match_table = sparc_i8042_match,
        },
        .probe          = sparc_i8042_probe,
-       .remove_new     = sparc_i8042_remove,
+       .remove         = sparc_i8042_remove,
 };
 
 static bool i8042_is_mr_coffee(void)

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 86916fe..509330a 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1590,7 +1590,7 @@ static struct platform_driver i8042_driver = {
 #endif
        },
        .probe          = i8042_probe,
-       .remove_new     = i8042_remove,
+       .remove         = i8042_remove,
        .shutdown       = i8042_shutdown,
 };
 

diff --git a/drivers/input/serio/ioc3kbd.c b/drivers/input/serio/ioc3kbd.c
index 676b0bd..d2c7ffb 100644 (file)
--- a/drivers/input/serio/ioc3kbd.c
+++ b/drivers/input/serio/ioc3kbd.c
@@ -208,7 +208,7 @@ MODULE_DEVICE_TABLE(platform, ioc3kbd_id_table);
 
 static struct platform_driver ioc3kbd_driver = {
        .probe          = ioc3kbd_probe,
-       .remove_new     = ioc3kbd_remove,
+       .remove         = ioc3kbd_remove,
        .id_table       = ioc3kbd_id_table,
        .driver = {
                .name = "ioc3-kbd",

diff --git a/drivers/input/serio/maceps2.c b/drivers/input/serio/maceps2.c
index 42ac1eb..3d28a5c 100644 (file)
--- a/drivers/input/serio/maceps2.c
+++ b/drivers/input/serio/maceps2.c
@@ -159,7 +159,7 @@ static struct platform_driver maceps2_driver = {
                .name   = "maceps2",
        },
        .probe          = maceps2_probe,
-       .remove_new     = maceps2_remove,
+       .remove         = maceps2_remove,
 };
 
 static int __init maceps2_init(void)

diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c
index 0ad95e8..a243248 100644 (file)
--- a/drivers/input/serio/olpc_apsp.c
+++ b/drivers/input/serio/olpc_apsp.c
@@ -256,7 +256,7 @@ MODULE_DEVICE_TABLE(of, olpc_apsp_dt_ids);
 
 static struct platform_driver olpc_apsp_driver = {
        .probe          = olpc_apsp_probe,
-       .remove_new     = olpc_apsp_remove,
+       .remove         = olpc_apsp_remove,
        .driver         = {
                .name   = "olpc-apsp",
                .of_match_table = olpc_apsp_dt_ids,

diff --git a/drivers/input/serio/ps2-gpio.c b/drivers/input/serio/ps2-gpio.c
index 3e4ae2c..9376991 100644 (file)
--- a/drivers/input/serio/ps2-gpio.c
+++ b/drivers/input/serio/ps2-gpio.c
@@ -491,7 +491,7 @@ MODULE_DEVICE_TABLE(of, ps2_gpio_match);
 
 static struct platform_driver ps2_gpio_driver = {
        .probe          = ps2_gpio_probe,
-       .remove_new     = ps2_gpio_remove,
+       .remove         = ps2_gpio_remove,
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = of_match_ptr(ps2_gpio_match),

diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index cdd5c4e..ae55c4d 100644 (file)
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -160,7 +160,7 @@ static struct platform_driver q40kbd_driver = {
        .driver         = {
                .name   = "q40kbd",
        },
-       .remove_new     = q40kbd_remove,
+       .remove         = q40kbd_remove,
 };
 
 module_platform_driver_probe(q40kbd_driver, q40kbd_probe);

diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c
index e236bb7..c65c552 100644 (file)
--- a/drivers/input/serio/rpckbd.c
+++ b/drivers/input/serio/rpckbd.c
@@ -144,7 +144,7 @@ static void rpckbd_remove(struct platform_device *dev)
 
 static struct platform_driver rpckbd_driver = {
        .probe          = rpckbd_probe,
-       .remove_new     = rpckbd_remove,
+       .remove         = rpckbd_remove,
        .driver         = {
                .name   = "kart",
        },

diff --git a/drivers/input/serio/sun4i-ps2.c b/drivers/input/serio/sun4i-ps2.c
index 267214c..524929c 100644 (file)
--- a/drivers/input/serio/sun4i-ps2.c
+++ b/drivers/input/serio/sun4i-ps2.c
@@ -318,7 +318,7 @@ MODULE_DEVICE_TABLE(of, sun4i_ps2_match);
 
 static struct platform_driver sun4i_ps2_driver = {
        .probe          = sun4i_ps2_probe,
-       .remove_new     = sun4i_ps2_remove,
+       .remove         = sun4i_ps2_remove,
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = sun4i_ps2_match,

diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index 0316760..01433f0 100644 (file)
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -353,7 +353,7 @@ static struct platform_driver xps2_of_driver = {
                .of_match_table = xps2_of_match,
        },
        .probe          = xps2_of_probe,
-       .remove_new     = xps2_of_remove,
+       .remove         = xps2_of_remove,
 };
 module_platform_driver(xps2_of_driver);
 

diff --git a/drivers/input/touchscreen/da9052_tsi.c b/drivers/input/touchscreen/da9052_tsi.c
index 52e0e83..c2d3252 100644 (file)
--- a/drivers/input/touchscreen/da9052_tsi.c
+++ b/drivers/input/touchscreen/da9052_tsi.c
@@ -326,7 +326,7 @@ static void da9052_ts_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_tsi_driver = {
        .probe  = da9052_ts_probe,
-       .remove_new = da9052_ts_remove,
+       .remove = da9052_ts_remove,
        .driver = {
                .name   = "da9052-tsi",
        },

diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index bfbebe2..5abf164 100644 (file)
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -261,7 +261,7 @@ static void mainstone_wm97xx_remove(struct platform_device *pdev)
 
 static struct platform_driver mainstone_wm97xx_driver = {
        .probe  = mainstone_wm97xx_probe,
-       .remove_new = mainstone_wm97xx_remove,
+       .remove = mainstone_wm97xx_remove,
        .driver = {
                .name   = "wm97xx-touch",
        },

diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index cbcd6e3..33635da 100644 (file)
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -226,7 +226,7 @@ static void mc13783_ts_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver mc13783_ts_driver = {
-       .remove_new     = mc13783_ts_remove,
+       .remove         = mc13783_ts_remove,
        .driver         = {
                .name   = MC13783_TS_NAME,
        },

diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c
index 8212450..083206a 100644 (file)
--- a/drivers/input/touchscreen/pcap_ts.c
+++ b/drivers/input/touchscreen/pcap_ts.c
@@ -238,7 +238,7 @@ static const struct dev_pm_ops pcap_ts_pm_ops = {
 
 static struct platform_driver pcap_ts_driver = {
        .probe          = pcap_ts_probe,
-       .remove_new     = pcap_ts_remove,
+       .remove         = pcap_ts_remove,
        .driver         = {
                .name   = "pcap-ts",
                .pm     = PCAP_TS_PM_OPS,

diff --git a/drivers/input/touchscreen/stmpe-ts.c b/drivers/input/touchscreen/stmpe-ts.c
index 2228842..a94a199 100644 (file)
--- a/drivers/input/touchscreen/stmpe-ts.c
+++ b/drivers/input/touchscreen/stmpe-ts.c
@@ -362,7 +362,7 @@ static struct platform_driver stmpe_ts_driver = {
                .name = STMPE_TS_NAME,
        },
        .probe = stmpe_input_probe,
-       .remove_new = stmpe_ts_remove,
+       .remove = stmpe_ts_remove,
 };
 module_platform_driver(stmpe_ts_driver);
 

diff --git a/drivers/input/touchscreen/sun4i-ts.c b/drivers/input/touchscreen/sun4i-ts.c
index 92b2b84..e828606 100644 (file)
--- a/drivers/input/touchscreen/sun4i-ts.c
+++ b/drivers/input/touchscreen/sun4i-ts.c
@@ -396,12 +396,12 @@ static const struct of_device_id sun4i_ts_of_match[] = {
 MODULE_DEVICE_TABLE(of, sun4i_ts_of_match);
 
 static struct platform_driver sun4i_ts_driver = {
-       .driver = {
+       .driver = {
                .name   = "sun4i-ts",
                .of_match_table = sun4i_ts_of_match,
        },
        .probe  = sun4i_ts_probe,
-       .remove_new = sun4i_ts_remove,
+       .remove = sun4i_ts_remove,
 };
 
 module_platform_driver(sun4i_ts_driver);

diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index 294b7ce..93d659f 100644 (file)
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -550,9 +550,9 @@ MODULE_DEVICE_TABLE(of, ti_tsc_dt_ids);
 
 static struct platform_driver ti_tsc_driver = {
        .probe  = titsc_probe,
-       .remove_new = titsc_remove,
+       .remove = titsc_remove,
        .driver = {
-               .name   = "TI-am335x-tsc",
+               .name   = "TI-am335x-tsc",
                .pm     = pm_sleep_ptr(&titsc_pm_ops),
                .of_match_table = ti_tsc_dt_ids,
        },

diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index 9cee26b..98f8ec4 100644 (file)
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -387,7 +387,7 @@ static struct platform_driver wm831x_ts_driver = {
                .name = "wm831x-touch",
        },
        .probe = wm831x_ts_probe,
-       .remove_new = wm831x_ts_remove,
+       .remove = wm831x_ts_remove,
 };
 module_platform_driver(wm831x_ts_driver);
 

diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c
index 91384ad..b25771a 100644 (file)
--- a/drivers/input/touchscreen/wm97xx-core.c
+++ b/drivers/input/touchscreen/wm97xx-core.c
@@ -876,7 +876,7 @@ static struct platform_driver wm97xx_mfd_driver = {
                .pm =           pm_sleep_ptr(&wm97xx_pm_ops),
        },
        .probe =        wm97xx_mfd_probe,
-       .remove_new =   wm97xx_mfd_remove,
+       .remove =       wm97xx_mfd_remove,
 };
 
 static int __init wm97xx_init(void)