Skip to content

Commit a9dedaa

Browse files
ukleinekrafaeljw
authored andcommitted
cpufreq: 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/cpufreq 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. Signed-off-by: Uwe Kleine-König <[email protected]> Acked-by: Viresh Kumar <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 8d5459f commit a9dedaa

20 files changed

+20
-20
lines changed

drivers/cpufreq/acpi-cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1028,7 +1028,7 @@ static struct platform_driver acpi_cpufreq_platdrv = {
10281028
.driver = {
10291029
.name = "acpi-cpufreq",
10301030
},
1031-
.remove_new = acpi_cpufreq_remove,
1031+
.remove = acpi_cpufreq_remove,
10321032
};
10331033

10341034
static int __init acpi_cpufreq_init(void)

drivers/cpufreq/brcmstb-avs-cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ static struct platform_driver brcm_avs_cpufreq_platdrv = {
777777
.of_match_table = brcm_avs_cpufreq_match,
778778
},
779779
.probe = brcm_avs_cpufreq_probe,
780-
.remove_new = brcm_avs_cpufreq_remove,
780+
.remove = brcm_avs_cpufreq_remove,
781781
};
782782
module_platform_driver(brcm_avs_cpufreq_platdrv);
783783

drivers/cpufreq/cpufreq-dt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ static struct platform_driver dt_cpufreq_platdrv = {
345345
.name = "cpufreq-dt",
346346
},
347347
.probe = dt_cpufreq_probe,
348-
.remove_new = dt_cpufreq_remove,
348+
.remove = dt_cpufreq_remove,
349349
};
350350
module_platform_driver(dt_cpufreq_platdrv);
351351

drivers/cpufreq/davinci-cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static struct platform_driver davinci_cpufreq_driver = {
145145
.driver = {
146146
.name = "cpufreq-davinci",
147147
},
148-
.remove_new = __exit_p(davinci_cpufreq_remove),
148+
.remove = __exit_p(davinci_cpufreq_remove),
149149
};
150150

151151
int __init davinci_cpufreq_init(void)

drivers/cpufreq/imx-cpufreq-dt.c

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

184184
static struct platform_driver imx_cpufreq_dt_driver = {
185185
.probe = imx_cpufreq_dt_probe,
186-
.remove_new = imx_cpufreq_dt_remove,
186+
.remove = imx_cpufreq_dt_remove,
187187
.driver = {
188188
.name = "imx-cpufreq-dt",
189189
},

drivers/cpufreq/imx6q-cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ static struct platform_driver imx6q_cpufreq_platdrv = {
522522
.name = "imx6q-cpufreq",
523523
},
524524
.probe = imx6q_cpufreq_probe,
525-
.remove_new = imx6q_cpufreq_remove,
525+
.remove = imx6q_cpufreq_remove,
526526
};
527527
module_platform_driver(imx6q_cpufreq_platdrv);
528528

drivers/cpufreq/kirkwood-cpufreq.c

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

190190
static struct platform_driver kirkwood_cpufreq_platform_driver = {
191191
.probe = kirkwood_cpufreq_probe,
192-
.remove_new = kirkwood_cpufreq_remove,
192+
.remove = kirkwood_cpufreq_remove,
193193
.driver = {
194194
.name = "kirkwood-cpufreq",
195195
},

drivers/cpufreq/loongson3_cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ static struct platform_driver loongson3_platform_driver = {
386386
},
387387
.id_table = cpufreq_id_table,
388388
.probe = loongson3_cpufreq_probe,
389-
.remove_new = loongson3_cpufreq_remove,
389+
.remove = loongson3_cpufreq_remove,
390390
};
391391
module_platform_driver(loongson3_platform_driver);
392392

drivers/cpufreq/mediatek-cpufreq-hw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ MODULE_DEVICE_TABLE(of, mtk_cpufreq_hw_match);
344344

345345
static struct platform_driver mtk_cpufreq_hw_driver = {
346346
.probe = mtk_cpufreq_hw_driver_probe,
347-
.remove_new = mtk_cpufreq_hw_driver_remove,
347+
.remove = mtk_cpufreq_hw_driver_remove,
348348
.driver = {
349349
.name = "mtk-cpufreq-hw",
350350
.of_match_table = mtk_cpufreq_hw_match,

drivers/cpufreq/omap-cpufreq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static struct platform_driver omap_cpufreq_platdrv = {
188188
.name = "omap-cpufreq",
189189
},
190190
.probe = omap_cpufreq_probe,
191-
.remove_new = omap_cpufreq_remove,
191+
.remove = omap_cpufreq_remove,
192192
};
193193
module_platform_driver(omap_cpufreq_platdrv);
194194

0 commit comments

Comments
 (0)