Skip to content

Commit 10821a0

Browse files
ukleineklag-linaro
authored andcommitted
mfd: Switch back to struct platform_driver::remove()
After commit 0edb555 ("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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 42e34f8 commit 10821a0

19 files changed

+23
-23
lines changed

drivers/mfd/ab8500-sysctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static struct platform_driver ab8500_sysctrl_driver = {
159159
.of_match_table = ab8500_sysctrl_match,
160160
},
161161
.probe = ab8500_sysctrl_probe,
162-
.remove_new = ab8500_sysctrl_remove,
162+
.remove = ab8500_sysctrl_remove,
163163
};
164164

165165
static int __init ab8500_sysctrl_init(void)

drivers/mfd/cgbc-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ static struct platform_driver cgbc_driver = {
364364
.dev_groups = cgbc_groups,
365365
},
366366
.probe = cgbc_probe,
367-
.remove_new = cgbc_remove,
367+
.remove = cgbc_remove,
368368
};
369369

370370
static const struct dmi_system_id cgbc_dmi_table[] __initconst = {

drivers/mfd/cros_ec_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ static struct platform_driver cros_ec_dev_driver = {
365365
},
366366
.id_table = cros_ec_id,
367367
.probe = ec_device_probe,
368-
.remove_new = ec_device_remove,
368+
.remove = ec_device_remove,
369369
};
370370

371371
static int __init cros_ec_dev_init(void)

drivers/mfd/exynos-lpass.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ static const struct of_device_id exynos_lpass_of_match[] = {
179179
MODULE_DEVICE_TABLE(of, exynos_lpass_of_match);
180180

181181
static struct platform_driver exynos_lpass_driver = {
182-
.driver = {
182+
.driver = {
183183
.name = "exynos-lpass",
184184
.pm = &lpass_pm_ops,
185185
.of_match_table = exynos_lpass_of_match,
186186
},
187187
.probe = exynos_lpass_probe,
188-
.remove_new = exynos_lpass_remove,
188+
.remove = exynos_lpass_remove,
189189
};
190190
module_platform_driver(exynos_lpass_driver);
191191

drivers/mfd/fsl-imx25-tsadc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ static struct platform_driver mx25_tsadc_driver = {
211211
.of_match_table = mx25_tsadc_ids,
212212
},
213213
.probe = mx25_tsadc_probe,
214-
.remove_new = mx25_tsadc_remove,
214+
.remove = mx25_tsadc_remove,
215215
};
216216
module_platform_driver(mx25_tsadc_driver);
217217

drivers/mfd/hi655x-pmic.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ static const struct of_device_id hi655x_pmic_match[] = {
159159
MODULE_DEVICE_TABLE(of, hi655x_pmic_match);
160160

161161
static struct platform_driver hi655x_pmic_driver = {
162-
.driver = {
163-
.name = "hi655x-pmic",
162+
.driver = {
163+
.name = "hi655x-pmic",
164164
.of_match_table = hi655x_pmic_match,
165165
},
166-
.probe = hi655x_pmic_probe,
167-
.remove_new = hi655x_pmic_remove,
166+
.probe = hi655x_pmic_probe,
167+
.remove = hi655x_pmic_remove,
168168
};
169169
module_platform_driver(hi655x_pmic_driver);
170170

drivers/mfd/intel-lpss-acpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ static void intel_lpss_acpi_remove(struct platform_device *pdev)
208208

209209
static struct platform_driver intel_lpss_acpi_driver = {
210210
.probe = intel_lpss_acpi_probe,
211-
.remove_new = intel_lpss_acpi_remove,
211+
.remove = intel_lpss_acpi_remove,
212212
.driver = {
213213
.name = "intel-lpss",
214214
.acpi_match_table = intel_lpss_acpi_ids,

drivers/mfd/kempld-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ static struct platform_driver kempld_driver = {
486486
.dev_groups = pld_groups,
487487
},
488488
.probe = kempld_probe,
489-
.remove_new = kempld_remove,
489+
.remove = kempld_remove,
490490
};
491491

492492
static const struct dmi_system_id kempld_dmi_table[] __initconst = {

drivers/mfd/mcp-sa11x0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ static const struct dev_pm_ops mcp_sa11x0_pm_ops = {
286286

287287
static struct platform_driver mcp_sa11x0_driver = {
288288
.probe = mcp_sa11x0_probe,
289-
.remove_new = mcp_sa11x0_remove,
289+
.remove = mcp_sa11x0_remove,
290290
.driver = {
291291
.name = DRIVER_NAME,
292292
.pm = pm_sleep_ptr(&mcp_sa11x0_pm_ops),

drivers/mfd/mxs-lradc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ static struct platform_driver mxs_lradc_driver = {
243243
.of_match_table = mxs_lradc_dt_ids,
244244
},
245245
.probe = mxs_lradc_probe,
246-
.remove_new = mxs_lradc_remove,
246+
.remove = mxs_lradc_remove,
247247
};
248248
module_platform_driver(mxs_lradc_driver);
249249

0 commit comments

Comments
 (0)