mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-28 16:53:49 +00:00
mfd: 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/mfd 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.
On the way do a few whitespace changes to make indention consistent.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20241025102943.250184-2-u.kleine-koenig@baylibre.com
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
parent
42e34f8446
commit
10821a0613
@ -159,7 +159,7 @@ static struct platform_driver ab8500_sysctrl_driver = {
|
||||
.of_match_table = ab8500_sysctrl_match,
|
||||
},
|
||||
.probe = ab8500_sysctrl_probe,
|
||||
.remove_new = ab8500_sysctrl_remove,
|
||||
.remove = ab8500_sysctrl_remove,
|
||||
};
|
||||
|
||||
static int __init ab8500_sysctrl_init(void)
|
||||
|
@ -364,7 +364,7 @@ static struct platform_driver cgbc_driver = {
|
||||
.dev_groups = cgbc_groups,
|
||||
},
|
||||
.probe = cgbc_probe,
|
||||
.remove_new = cgbc_remove,
|
||||
.remove = cgbc_remove,
|
||||
};
|
||||
|
||||
static const struct dmi_system_id cgbc_dmi_table[] __initconst = {
|
||||
|
@ -365,7 +365,7 @@ static struct platform_driver cros_ec_dev_driver = {
|
||||
},
|
||||
.id_table = cros_ec_id,
|
||||
.probe = ec_device_probe,
|
||||
.remove_new = ec_device_remove,
|
||||
.remove = ec_device_remove,
|
||||
};
|
||||
|
||||
static int __init cros_ec_dev_init(void)
|
||||
|
@ -179,13 +179,13 @@ static const struct of_device_id exynos_lpass_of_match[] = {
|
||||
MODULE_DEVICE_TABLE(of, exynos_lpass_of_match);
|
||||
|
||||
static struct platform_driver exynos_lpass_driver = {
|
||||
.driver = {
|
||||
.driver = {
|
||||
.name = "exynos-lpass",
|
||||
.pm = &lpass_pm_ops,
|
||||
.of_match_table = exynos_lpass_of_match,
|
||||
},
|
||||
.probe = exynos_lpass_probe,
|
||||
.remove_new = exynos_lpass_remove,
|
||||
.remove = exynos_lpass_remove,
|
||||
};
|
||||
module_platform_driver(exynos_lpass_driver);
|
||||
|
||||
|
@ -211,7 +211,7 @@ static struct platform_driver mx25_tsadc_driver = {
|
||||
.of_match_table = mx25_tsadc_ids,
|
||||
},
|
||||
.probe = mx25_tsadc_probe,
|
||||
.remove_new = mx25_tsadc_remove,
|
||||
.remove = mx25_tsadc_remove,
|
||||
};
|
||||
module_platform_driver(mx25_tsadc_driver);
|
||||
|
||||
|
@ -159,12 +159,12 @@ static const struct of_device_id hi655x_pmic_match[] = {
|
||||
MODULE_DEVICE_TABLE(of, hi655x_pmic_match);
|
||||
|
||||
static struct platform_driver hi655x_pmic_driver = {
|
||||
.driver = {
|
||||
.name = "hi655x-pmic",
|
||||
.driver = {
|
||||
.name = "hi655x-pmic",
|
||||
.of_match_table = hi655x_pmic_match,
|
||||
},
|
||||
.probe = hi655x_pmic_probe,
|
||||
.remove_new = hi655x_pmic_remove,
|
||||
.probe = hi655x_pmic_probe,
|
||||
.remove = hi655x_pmic_remove,
|
||||
};
|
||||
module_platform_driver(hi655x_pmic_driver);
|
||||
|
||||
|
@ -208,7 +208,7 @@ static void intel_lpss_acpi_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver intel_lpss_acpi_driver = {
|
||||
.probe = intel_lpss_acpi_probe,
|
||||
.remove_new = intel_lpss_acpi_remove,
|
||||
.remove = intel_lpss_acpi_remove,
|
||||
.driver = {
|
||||
.name = "intel-lpss",
|
||||
.acpi_match_table = intel_lpss_acpi_ids,
|
||||
|
@ -486,7 +486,7 @@ static struct platform_driver kempld_driver = {
|
||||
.dev_groups = pld_groups,
|
||||
},
|
||||
.probe = kempld_probe,
|
||||
.remove_new = kempld_remove,
|
||||
.remove = kempld_remove,
|
||||
};
|
||||
|
||||
static const struct dmi_system_id kempld_dmi_table[] __initconst = {
|
||||
|
@ -286,7 +286,7 @@ static const struct dev_pm_ops mcp_sa11x0_pm_ops = {
|
||||
|
||||
static struct platform_driver mcp_sa11x0_driver = {
|
||||
.probe = mcp_sa11x0_probe,
|
||||
.remove_new = mcp_sa11x0_remove,
|
||||
.remove = mcp_sa11x0_remove,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.pm = pm_sleep_ptr(&mcp_sa11x0_pm_ops),
|
||||
|
@ -243,7 +243,7 @@ static struct platform_driver mxs_lradc_driver = {
|
||||
.of_match_table = mxs_lradc_dt_ids,
|
||||
},
|
||||
.probe = mxs_lradc_probe,
|
||||
.remove_new = mxs_lradc_remove,
|
||||
.remove = mxs_lradc_remove,
|
||||
};
|
||||
module_platform_driver(mxs_lradc_driver);
|
||||
|
||||
|
@ -843,7 +843,7 @@ static struct platform_driver usbhs_omap_driver = {
|
||||
.of_match_table = usbhs_omap_dt_ids,
|
||||
},
|
||||
.probe = usbhs_omap_probe,
|
||||
.remove_new = usbhs_omap_remove,
|
||||
.remove = usbhs_omap_remove,
|
||||
};
|
||||
|
||||
MODULE_AUTHOR("Keshava Munegowda <keshava_mgowda@ti.com>");
|
||||
|
@ -301,7 +301,7 @@ static struct platform_driver usbtll_omap_driver = {
|
||||
.of_match_table = usbtll_omap_dt_ids,
|
||||
},
|
||||
.probe = usbtll_omap_probe,
|
||||
.remove_new = usbtll_omap_remove,
|
||||
.remove = usbtll_omap_remove,
|
||||
};
|
||||
|
||||
int omap_tll_init(struct usbhs_omap_platform_data *pdata)
|
||||
|
@ -243,7 +243,7 @@ static struct platform_driver pcf50633_adc_driver = {
|
||||
.name = "pcf50633-adc",
|
||||
},
|
||||
.probe = pcf50633_adc_probe,
|
||||
.remove_new = pcf50633_adc_remove,
|
||||
.remove = pcf50633_adc_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(pcf50633_adc_driver);
|
||||
|
@ -595,7 +595,7 @@ static void pm8xxx_remove(struct platform_device *pdev)
|
||||
|
||||
static struct platform_driver pm8xxx_driver = {
|
||||
.probe = pm8xxx_probe,
|
||||
.remove_new = pm8xxx_remove,
|
||||
.remove = pm8xxx_remove,
|
||||
.driver = {
|
||||
.name = "pm8xxx-core",
|
||||
.of_match_table = pm8xxx_id_table,
|
||||
|
@ -1705,7 +1705,7 @@ static struct platform_driver sm501_plat_driver = {
|
||||
.of_match_table = of_sm501_match_tbl,
|
||||
},
|
||||
.probe = sm501_plat_probe,
|
||||
.remove_new = sm501_plat_remove,
|
||||
.remove = sm501_plat_remove,
|
||||
.suspend = pm_sleep_ptr(sm501_plat_suspend),
|
||||
.resume = pm_sleep_ptr(sm501_plat_resume),
|
||||
};
|
||||
|
@ -326,7 +326,7 @@ MODULE_DEVICE_TABLE(of, stm32_timers_of_match);
|
||||
|
||||
static struct platform_driver stm32_timers_driver = {
|
||||
.probe = stm32_timers_probe,
|
||||
.remove_new = stm32_timers_remove,
|
||||
.remove = stm32_timers_remove,
|
||||
.driver = {
|
||||
.name = "stm32-timers",
|
||||
.of_match_table = stm32_timers_of_match,
|
||||
|
@ -377,7 +377,7 @@ static struct platform_driver ti_tscadc_driver = {
|
||||
.of_match_table = ti_tscadc_dt_ids,
|
||||
},
|
||||
.probe = ti_tscadc_probe,
|
||||
.remove_new = ti_tscadc_remove,
|
||||
.remove = ti_tscadc_remove,
|
||||
|
||||
};
|
||||
|
||||
|
@ -154,7 +154,7 @@ static struct platform_driver tps65911_comparator_driver = {
|
||||
.name = "tps65911-comparator",
|
||||
},
|
||||
.probe = tps65911_comparator_probe,
|
||||
.remove_new = tps65911_comparator_remove,
|
||||
.remove = tps65911_comparator_remove,
|
||||
};
|
||||
|
||||
static int __init tps65911_comparator_init(void)
|
||||
|
@ -276,7 +276,7 @@ static struct platform_driver twl4030_audio_driver = {
|
||||
.of_match_table = twl4030_audio_of_match,
|
||||
},
|
||||
.probe = twl4030_audio_probe,
|
||||
.remove_new = twl4030_audio_remove,
|
||||
.remove = twl4030_audio_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(twl4030_audio_driver);
|
||||
|
Loading…
Reference in New Issue
Block a user