mirror of
https://github.com/Dasharo/linux.git
synced 2026-03-06 15:25:10 -08:00
Input: switch back to struct platform_driver::remove()
After commit 0edb555a65 ("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>
This commit is contained in:
committed by
Dmitry Torokhov
parent
1ec46bf0e4
commit
2c19d01599
@@ -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);
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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",
|
||||
},
|
||||
};
|
||||
|
||||
@@ -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",
|
||||
},
|
||||
};
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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",
|
||||
},
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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",
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user