thermal: 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/thermal 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 make 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/20241019163412.304422-2-u.kleine-koenig@baylibre.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_thermal.c
index cd4776aa805e05a4d8cacc8442394b0b78e35936..3c5f7dbddf2c1fd979e61615b47e4eb12a19f95e 100644 (file)
--- a/drivers/thermal/amlogic_thermal.c
+++ b/drivers/thermal/amlogic_thermal.c
@@ -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);

diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index fdcb077cfd54e76720a9a2cdc38c2845375294b5..9bff21068721cb1f405f7e80a7a0865d37e1c234 100644 (file)
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -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,

diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index 7d61493082b5a0db0debd509c9aa3e5c8abbd673..7fbba2233c4c12e14090832a62784e1500c0ab79 100644 (file)
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -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,

diff --git a/drivers/thermal/broadcom/ns-thermal.c b/drivers/thermal/broadcom/ns-thermal.c
index 5eaf79c490f0f6ba208ef9bf3680181cd14d7ac7..8b5b32f749ee89cfc7aacac57e8313e46857fa77 100644 (file)
--- a/drivers/thermal/broadcom/ns-thermal.c
+++ b/drivers/thermal/broadcom/ns-thermal.c
@@ -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,

diff --git a/drivers/thermal/da9062-thermal.c b/drivers/thermal/da9062-thermal.c
index a27aff88cd96cbe17a0360781167b05ea4a241a4..2077e85ef5caecb93617d261217740b6e121329b 100644 (file)
--- a/drivers/thermal/da9062-thermal.c
+++ b/drivers/thermal/da9062-thermal.c
@@ -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,
        },
 };
 

diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
index ac30de3c0a5fb9a968d66c342eb695e283759dbb..f9157a47156b08a3524b0b9f6557fcae18e127d9 100644 (file)
--- a/drivers/thermal/dove_thermal.c
+++ b/drivers/thermal/dove_thermal.c
@@ -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,

diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index f1fe0f8ab04f178f639cf85123b7d3e796f5ae22..7e918bd3f100245351d13f76479685909deb2f65 100644 (file)
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -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);

diff --git a/drivers/thermal/imx8mm_thermal.c b/drivers/thermal/imx8mm_thermal.c
index d74ed6ce2974c47ce80e5157c79f11faf5a2f208..719d71f5b23565cb8dfdc2ab581e0ef7a7dd571f 100644 (file)
--- a/drivers/thermal/imx8mm_thermal.c
+++ b/drivers/thermal/imx8mm_thermal.c
@@ -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);
 

diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index b8e85a405351ba8d053eba4cdf038be21e32773c..bab52e6b3b1558bbd0ed28b6008d824fc299be3d 100644 (file)
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -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);
 

diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index b0c0f0ffdcb046607b4478390f39a77ae316a511..b2fc02c3a767ad6bb4fe846b259af8a05a60a95d 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -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),

diff --git a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c
index 193645a73861be3aff3744e0092cd3a665b86d99..96d6277a5a8c4757081b2d85a7282e31377574cb 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c
@@ -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,

diff --git a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c
index ab8bfb5a3946bc261107c95bd0466ce04d7d95c7..543b03960e9923ca376f13a2d2a62d6816e5fb77 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c
@@ -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,

diff --git a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
index c094a422ded3d9b6dfcdc2b604f31baa9386ed99..04aa0afb3b1d54475ac7d3c0dd979e31ebde0e4e 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3403_thermal.c
@@ -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,

diff --git a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c
index 1c266493c1aade32af2b17469cb19fc580a90bc3..e21fcbccf4ba63568d2a05a04e902f5f4e535e56 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c
@@ -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,

diff --git a/drivers/thermal/k3_bandgap.c b/drivers/thermal/k3_bandgap.c
index 2a703770fc917e25db9a877f258e3bf6e95cc417..678d6ed711b5efb0a2f2a7eeb7c063263ba4e433 100644 (file)
--- a/drivers/thermal/k3_bandgap.c
+++ b/drivers/thermal/k3_bandgap.c
@@ -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,

diff --git a/drivers/thermal/k3_j72xx_bandgap.c b/drivers/thermal/k3_j72xx_bandgap.c
index 9bc279ac131a4ebedfca1ea0ba637b16b0549b47..ccd42db9717721d236bf4ddcb61701b362b236d3 100644 (file)
--- a/drivers/thermal/k3_j72xx_bandgap.c
+++ b/drivers/thermal/k3_j72xx_bandgap.c
@@ -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,

diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
index a18158ebe65f63c0bec85130d3186379b3d8cc95..7c22652316688b82694299186bc4fa8b98cdf6f6 100644 (file)
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -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,

diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/mediatek/lvts_thermal.c
index ce223bab6b551a8afefcc90629c65d918470a769..07f7f3b7a2fb569cfc300dc2126ea426e161adff 100644 (file)
--- a/drivers/thermal/mediatek/lvts_thermal.c
+++ b/drivers/thermal/mediatek/lvts_thermal.c
@@ -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,

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 0b4421bf478544dfa071c792dc812ffaedc9c635..3fbb0834af6cfabd0a9e46ac1f088ab8f53ec9d8 100644 (file)
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -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,

diff --git a/drivers/thermal/renesas/rcar_gen3_thermal.c b/drivers/thermal/renesas/rcar_gen3_thermal.c
index 810f866774612b66f025fa8df91d899231203b59..1ec169aeacfc30e24dc9234052a6f8bc50108db0 100644 (file)
--- a/drivers/thermal/renesas/rcar_gen3_thermal.c
+++ b/drivers/thermal/renesas/rcar_gen3_thermal.c
@@ -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);
 

diff --git a/drivers/thermal/renesas/rcar_thermal.c b/drivers/thermal/renesas/rcar_thermal.c
index ddc8341e5c3fa0417282b3e155389d6046042896..00a66ee0a5b00c5f240c52087817ade7a17c0c72 100644 (file)
--- a/drivers/thermal/renesas/rcar_thermal.c
+++ b/drivers/thermal/renesas/rcar_thermal.c
@@ -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);
 

diff --git a/drivers/thermal/renesas/rzg2l_thermal.c b/drivers/thermal/renesas/rzg2l_thermal.c
index 0e1cb9045ee6ffc187618a9cbd7eb7acbc2d1001..b588be628640a37135f8c3741924819317b0648e 100644 (file)
--- a/drivers/thermal/renesas/rzg2l_thermal.c
+++ b/drivers/thermal/renesas/rzg2l_thermal.c
@@ -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);
 

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 086ed42dd16cd4cabc717b2e4fe78fa7c5f6e206..f551df48eef935757629f4a6b2a619f1506c1cf3 100644 (file)
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -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);

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 96cffb2c44ba3554434f25696d8fd5a5591156da..47a99b3c5395825132d916f7d0f32f0cf2dca171 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -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);

diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index 60a871998b07e3529ee653bc09ee32f55398295e..bb96be9475213839a9e3e7e588346f5aca2f9c21 100644 (file)
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -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,

diff --git a/drivers/thermal/sprd_thermal.c b/drivers/thermal/sprd_thermal.c
index dfd1d529c4101d06ead6c633d15df24e62cd0e52..e546067c962187bc8ef594bc520033c7561cd808 100644 (file)
--- a/drivers/thermal/sprd_thermal.c
+++ b/drivers/thermal/sprd_thermal.c
@@ -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,

diff --git a/drivers/thermal/st/st_thermal_memmap.c b/drivers/thermal/st/st_thermal_memmap.c
index 97493d2b2f4999c929747ea1934397d41f103c4a..8f76e50ea5677f53b9d98deb00ee82b9626c7ce7 100644 (file)
--- a/drivers/thermal/st/st_thermal_memmap.c
+++ b/drivers/thermal/st/st_thermal_memmap.c
@@ -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);

diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c
index ffd988600ed6a27732c8f8b7437c4c35fe200573..6e90eb9f414dfc4f243806714c4647a78e59dbff 100644 (file)
--- a/drivers/thermal/st/stm_thermal.c
+++ b/drivers/thermal/st/stm_thermal.c
@@ -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);
 

diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c
index a023c948afbddd6d9fc1a00b2fe310c71147bda9..6f1501e3fcc4c09b1c5f0dc3526176ededc07588 100644 (file)
--- a/drivers/thermal/tegra/soctherm.c
+++ b/drivers/thermal/tegra/soctherm.c
@@ -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,

diff --git a/drivers/thermal/tegra/tegra-bpmp-thermal.c b/drivers/thermal/tegra/tegra-bpmp-thermal.c
index 72ce14c980cdb4e71d3286e67900f3f5896da02e..997d77ce30d94c45e133f26272a8651ddef9d366 100644 (file)
--- a/drivers/thermal/tegra/tegra-bpmp-thermal.c
+++ b/drivers/thermal/tegra/tegra-bpmp-thermal.c
@@ -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,

diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index caadfc61be93ab06bcbf70d0bce44a4f614db5b4..ba43399d0b384cf86d12642cc184c5f14066f431 100644 (file)
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -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,

diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
index 0325b719513633c9028ee4ccf7725e518de1aaa4..1a04294effea290b3beb503e5753b9878b38b25f 100644 (file)
--- a/drivers/thermal/uniphier_thermal.c
+++ b/drivers/thermal/uniphier_thermal.c
@@ -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,