@@ -333,7 +333,7 @@ static struct platform_driver amlogic_thermal_driver = {
.of_match_table = of_amlogic_thermal_match,
},
.probe = amlogic_thermal_probe,
- .remove_new = amlogic_thermal_remove,
+ .remove = amlogic_thermal_remove,
};
module_platform_driver(amlogic_thermal_driver);
@@ -970,7 +970,7 @@ static void armada_thermal_exit(struct platform_device *pdev)
static struct platform_driver armada_thermal_driver = {
.probe = armada_thermal_probe,
- .remove_new = armada_thermal_exit,
+ .remove = armada_thermal_exit,
.driver = {
.name = "armada_thermal",
.of_match_table = armada_thermal_id_table,
@@ -268,7 +268,7 @@ static void bcm2835_thermal_remove(struct platform_device *pdev)
static struct platform_driver bcm2835_thermal_driver = {
.probe = bcm2835_thermal_probe,
- .remove_new = bcm2835_thermal_remove,
+ .remove = bcm2835_thermal_remove,
.driver = {
.name = "bcm2835_thermal",
.of_match_table = bcm2835_thermal_of_match_table,
@@ -80,7 +80,7 @@ MODULE_DEVICE_TABLE(of, ns_thermal_of_match);
static struct platform_driver ns_thermal_driver = {
.probe = ns_thermal_probe,
- .remove_new = ns_thermal_remove,
+ .remove = ns_thermal_remove,
.driver = {
.name = "ns-thermal",
.of_match_table = ns_thermal_of_match,
@@ -250,10 +250,10 @@ static void da9062_thermal_remove(struct platform_device *pdev)
static struct platform_driver da9062_thermal_driver = {
.probe = da9062_thermal_probe,
- .remove_new = da9062_thermal_remove,
+ .remove = da9062_thermal_remove,
.driver = {
- .name = "da9062-thermal",
- .of_match_table = da9062_compatible_reg_id_table,
+ .name = "da9062-thermal",
+ .of_match_table = da9062_compatible_reg_id_table,
},
};
@@ -170,7 +170,7 @@ MODULE_DEVICE_TABLE(of, dove_thermal_id_table);
static struct platform_driver dove_thermal_driver = {
.probe = dove_thermal_probe,
- .remove_new = dove_thermal_exit,
+ .remove = dove_thermal_exit,
.driver = {
.name = "dove_thermal",
.of_match_table = dove_thermal_id_table,
@@ -637,10 +637,10 @@ static struct platform_driver hisi_thermal_driver = {
.driver = {
.name = "hisi_thermal",
.pm = pm_sleep_ptr(&hisi_thermal_pm_ops),
- .of_match_table = of_hisi_thermal_match,
+ .of_match_table = of_hisi_thermal_match,
},
.probe = hisi_thermal_probe,
- .remove_new = hisi_thermal_remove,
+ .remove = hisi_thermal_remove,
};
module_platform_driver(hisi_thermal_driver);
@@ -399,7 +399,7 @@ static struct platform_driver imx8mm_tmu = {
.of_match_table = imx8mm_tmu_table,
},
.probe = imx8mm_tmu_probe,
- .remove_new = imx8mm_tmu_remove,
+ .remove = imx8mm_tmu_remove,
};
module_platform_driver(imx8mm_tmu);
@@ -861,7 +861,7 @@ static struct platform_driver imx_thermal = {
.of_match_table = of_imx_thermal_match,
},
.probe = imx_thermal_probe,
- .remove_new = imx_thermal_remove,
+ .remove = imx_thermal_remove,
};
module_platform_driver(imx_thermal);
@@ -707,7 +707,7 @@ MODULE_DEVICE_TABLE(acpi, int3400_thermal_match);
static struct platform_driver int3400_thermal_driver = {
.probe = int3400_thermal_probe,
- .remove_new = int3400_thermal_remove,
+ .remove = int3400_thermal_remove,
.driver = {
.name = "int3400 thermal",
.acpi_match_table = ACPI_PTR(int3400_thermal_match),
@@ -60,7 +60,7 @@ static SIMPLE_DEV_PM_OPS(int3401_proc_thermal_pm, int3401_thermal_suspend,
static struct platform_driver int3401_driver = {
.probe = int3401_add,
- .remove_new = int3401_remove,
+ .remove = int3401_remove,
.driver = {
.name = "int3401 thermal",
.acpi_match_table = int3401_device_ids,
@@ -89,7 +89,7 @@ MODULE_DEVICE_TABLE(acpi, int3402_thermal_match);
static struct platform_driver int3402_thermal_driver = {
.probe = int3402_thermal_probe,
- .remove_new = int3402_thermal_remove,
+ .remove = int3402_thermal_remove,
.driver = {
.name = "int3402 thermal",
.acpi_match_table = int3402_thermal_match,
@@ -281,7 +281,7 @@ MODULE_DEVICE_TABLE(acpi, int3403_device_ids);
static struct platform_driver int3403_driver = {
.probe = int3403_add,
- .remove_new = int3403_remove,
+ .remove = int3403_remove,
.driver = {
.name = "int3403 thermal",
.acpi_match_table = int3403_device_ids,
@@ -195,7 +195,7 @@ MODULE_DEVICE_TABLE(acpi, int3406_thermal_match);
static struct platform_driver int3406_thermal_driver = {
.probe = int3406_thermal_probe,
- .remove_new = int3406_thermal_remove,
+ .remove = int3406_thermal_remove,
.driver = {
.name = "int3406 thermal",
.acpi_match_table = int3406_thermal_match,
@@ -250,7 +250,7 @@ MODULE_DEVICE_TABLE(of, of_k3_bandgap_match);
static struct platform_driver k3_bandgap_sensor_driver = {
.probe = k3_bandgap_probe,
- .remove_new = k3_bandgap_remove,
+ .remove = k3_bandgap_remove,
.driver = {
.name = "k3-soc-thermal",
.of_match_table = of_k3_bandgap_match,
@@ -594,7 +594,7 @@ MODULE_DEVICE_TABLE(of, of_k3_j72xx_bandgap_match);
static struct platform_driver k3_j72xx_bandgap_sensor_driver = {
.probe = k3_j72xx_bandgap_probe,
- .remove_new = k3_j72xx_bandgap_remove,
+ .remove = k3_j72xx_bandgap_remove,
.driver = {
.name = "k3-j72xx-soc-thermal",
.of_match_table = of_k3_j72xx_bandgap_match,
@@ -102,7 +102,7 @@ MODULE_DEVICE_TABLE(of, kirkwood_thermal_id_table);
static struct platform_driver kirkwood_thermal_driver = {
.probe = kirkwood_thermal_probe,
- .remove_new = kirkwood_thermal_exit,
+ .remove = kirkwood_thermal_exit,
.driver = {
.name = "kirkwood_thermal",
.of_match_table = kirkwood_thermal_id_table,
@@ -1788,7 +1788,7 @@ static const struct dev_pm_ops lvts_pm_ops = {
static struct platform_driver lvts_driver = {
.probe = lvts_probe,
- .remove_new = lvts_remove,
+ .remove = lvts_remove,
.driver = {
.name = "mtk-lvts-thermal",
.of_match_table = lvts_of_match,
@@ -1360,7 +1360,7 @@ static void tsens_remove(struct platform_device *pdev)
static struct platform_driver tsens_driver = {
.probe = tsens_probe,
- .remove_new = tsens_remove,
+ .remove = tsens_remove,
.driver = {
.name = "qcom-tsens",
.pm = &tsens_pm_ops,
@@ -603,7 +603,7 @@ static struct platform_driver rcar_gen3_thermal_driver = {
.of_match_table = rcar_gen3_thermal_dt_ids,
},
.probe = rcar_gen3_thermal_probe,
- .remove_new = rcar_gen3_thermal_remove,
+ .remove = rcar_gen3_thermal_remove,
};
module_platform_driver(rcar_gen3_thermal_driver);
@@ -579,7 +579,7 @@ static struct platform_driver rcar_thermal_driver = {
.of_match_table = rcar_thermal_dt_ids,
},
.probe = rcar_thermal_probe,
- .remove_new = rcar_thermal_remove,
+ .remove = rcar_thermal_remove,
};
module_platform_driver(rcar_thermal_driver);
@@ -240,7 +240,7 @@ static struct platform_driver rzg2l_thermal_driver = {
.of_match_table = rzg2l_thermal_dt_ids,
},
.probe = rzg2l_thermal_probe,
- .remove_new = rzg2l_thermal_remove,
+ .remove = rzg2l_thermal_remove,
};
module_platform_driver(rzg2l_thermal_driver);
@@ -1689,7 +1689,7 @@ static struct platform_driver rockchip_thermal_driver = {
.of_match_table = of_rockchip_thermal_match,
},
.probe = rockchip_thermal_probe,
- .remove_new = rockchip_thermal_remove,
+ .remove = rockchip_thermal_remove,
};
module_platform_driver(rockchip_thermal_driver);
@@ -1164,7 +1164,7 @@ static struct platform_driver exynos_tmu_driver = {
.of_match_table = exynos_tmu_match,
},
.probe = exynos_tmu_probe,
- .remove_new = exynos_tmu_remove,
+ .remove = exynos_tmu_remove,
};
module_platform_driver(exynos_tmu_driver);
@@ -173,7 +173,7 @@ MODULE_DEVICE_TABLE(of, spear_thermal_id_table);
static struct platform_driver spear_thermal_driver = {
.probe = spear_thermal_probe,
- .remove_new = spear_thermal_exit,
+ .remove = spear_thermal_exit,
.driver = {
.name = "spear_thermal",
.pm = &spear_thermal_pm_ops,
@@ -534,7 +534,7 @@ static const struct dev_pm_ops sprd_thermal_pm_ops = {
static struct platform_driver sprd_thermal_driver = {
.probe = sprd_thm_probe,
- .remove_new = sprd_thm_remove,
+ .remove = sprd_thm_remove,
.driver = {
.name = "sprd-thermal",
.pm = &sprd_thermal_pm_ops,
@@ -174,7 +174,7 @@ static struct platform_driver st_mmap_thermal_driver = {
.of_match_table = st_mmap_thermal_of_match,
},
.probe = st_mmap_probe,
- .remove_new = st_mmap_remove,
+ .remove = st_mmap_remove,
};
module_platform_driver(st_mmap_thermal_driver);
@@ -582,7 +582,7 @@ static struct platform_driver stm_thermal_driver = {
.of_match_table = stm_thermal_of_match,
},
.probe = stm_thermal_probe,
- .remove_new = stm_thermal_remove,
+ .remove = stm_thermal_remove,
};
module_platform_driver(stm_thermal_driver);
@@ -2269,7 +2269,7 @@ static SIMPLE_DEV_PM_OPS(tegra_soctherm_pm, soctherm_suspend, soctherm_resume);
static struct platform_driver tegra_soctherm_driver = {
.probe = tegra_soctherm_probe,
- .remove_new = tegra_soctherm_remove,
+ .remove = tegra_soctherm_remove,
.driver = {
.name = "tegra_soctherm",
.pm = &tegra_soctherm_pm,
@@ -315,7 +315,7 @@ MODULE_DEVICE_TABLE(of, tegra_bpmp_thermal_of_match);
static struct platform_driver tegra_bpmp_thermal_driver = {
.probe = tegra_bpmp_thermal_probe,
- .remove_new = tegra_bpmp_thermal_remove,
+ .remove = tegra_bpmp_thermal_remove,
.driver = {
.name = "tegra-bpmp-thermal",
.of_match_table = tegra_bpmp_thermal_of_match,
@@ -1281,7 +1281,7 @@ MODULE_DEVICE_TABLE(of, of_ti_bandgap_match);
static struct platform_driver ti_bandgap_sensor_driver = {
.probe = ti_bandgap_probe,
- .remove_new = ti_bandgap_remove,
+ .remove = ti_bandgap_remove,
.driver = {
.name = "ti-soc-thermal",
.pm = DEV_PM_OPS,
@@ -371,7 +371,7 @@ MODULE_DEVICE_TABLE(of, uniphier_tm_dt_ids);
static struct platform_driver uniphier_tm_driver = {
.probe = uniphier_tm_probe,
- .remove_new = uniphier_tm_remove,
+ .remove = uniphier_tm_remove,
.driver = {
.name = "uniphier-thermal",
.of_match_table = uniphier_tm_dt_ids,
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/thermalto 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 make a few whitespace changes to make indention consistent. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> --- Hello, given the simplicity of the individual changes I do this all in a single patch. I you don't agree, please tell and I will happily split it. It's based on Friday's next, feel free to drop changes that result in a conflict when you come around to apply this. I'll care for the fallout at a later time then. (Having said that, if you use b4 am -3 and git am -3, there should be hardly any conflict.) Note I didn't Cc: all the individual driver maintainers to not trigger sending limits and spam filters. Best regards Uwe drivers/thermal/amlogic_thermal.c | 2 +- drivers/thermal/armada_thermal.c | 2 +- drivers/thermal/broadcom/bcm2835_thermal.c | 2 +- drivers/thermal/broadcom/ns-thermal.c | 2 +- drivers/thermal/da9062-thermal.c | 6 +++--- drivers/thermal/dove_thermal.c | 2 +- drivers/thermal/hisi_thermal.c | 4 ++-- drivers/thermal/imx8mm_thermal.c | 2 +- drivers/thermal/imx_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3401_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3402_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3403_thermal.c | 2 +- drivers/thermal/intel/int340x_thermal/int3406_thermal.c | 2 +- drivers/thermal/k3_bandgap.c | 2 +- drivers/thermal/k3_j72xx_bandgap.c | 2 +- drivers/thermal/kirkwood_thermal.c | 2 +- drivers/thermal/mediatek/lvts_thermal.c | 2 +- drivers/thermal/qcom/tsens.c | 2 +- drivers/thermal/renesas/rcar_gen3_thermal.c | 2 +- drivers/thermal/renesas/rcar_thermal.c | 2 +- drivers/thermal/renesas/rzg2l_thermal.c | 2 +- drivers/thermal/rockchip_thermal.c | 2 +- drivers/thermal/samsung/exynos_tmu.c | 2 +- drivers/thermal/spear_thermal.c | 2 +- drivers/thermal/sprd_thermal.c | 2 +- drivers/thermal/st/st_thermal_memmap.c | 2 +- drivers/thermal/st/stm_thermal.c | 2 +- drivers/thermal/tegra/soctherm.c | 2 +- drivers/thermal/tegra/tegra-bpmp-thermal.c | 2 +- drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +- drivers/thermal/uniphier_thermal.c | 2 +- 32 files changed, 35 insertions(+), 35 deletions(-) base-commit: f2493655d2d3d5c6958ed996b043c821c23ae8d3