| Message ID | 20241020153910.324096-2-u.kleine-koenig@baylibre.com (mailing list archive) |
|---|---|
| State | In Next |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | cpufreq: Switch back to struct platform_driver::remove() | expand |
On Sun, Oct 20, 2024 at 5:39 PM Uwe Kleine-König <u.kleine-koenig@baylibre.com> wrote: > > 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/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 <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. Viresh, I'll pick this up unless you'd prefer to apply it, so please let me know. > drivers/cpufreq/acpi-cpufreq.c | 2 +- > drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 +- > drivers/cpufreq/cpufreq-dt.c | 2 +- > drivers/cpufreq/davinci-cpufreq.c | 2 +- > drivers/cpufreq/imx-cpufreq-dt.c | 2 +- > drivers/cpufreq/imx6q-cpufreq.c | 2 +- > drivers/cpufreq/kirkwood-cpufreq.c | 2 +- > drivers/cpufreq/loongson3_cpufreq.c | 2 +- > drivers/cpufreq/mediatek-cpufreq-hw.c | 2 +- > drivers/cpufreq/omap-cpufreq.c | 2 +- > drivers/cpufreq/pcc-cpufreq.c | 2 +- > drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- > drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- > drivers/cpufreq/qoriq-cpufreq.c | 2 +- > drivers/cpufreq/raspberrypi-cpufreq.c | 2 +- > drivers/cpufreq/scpi-cpufreq.c | 2 +- > drivers/cpufreq/sun50i-cpufreq-nvmem.c | 2 +- > drivers/cpufreq/tegra186-cpufreq.c | 2 +- > drivers/cpufreq/tegra194-cpufreq.c | 2 +- > drivers/cpufreq/vexpress-spc-cpufreq.c | 2 +- > 20 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c > index 0f04feb6cafa..433eb597c2b8 100644 > --- a/drivers/cpufreq/acpi-cpufreq.c > +++ b/drivers/cpufreq/acpi-cpufreq.c > @@ -1028,7 +1028,7 @@ static struct platform_driver acpi_cpufreq_platdrv = { > .driver = { > .name = "acpi-cpufreq", > }, > - .remove_new = acpi_cpufreq_remove, > + .remove = acpi_cpufreq_remove, > }; > > static int __init acpi_cpufreq_init(void) > diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c > index ea8438550b49..5d03a295a085 100644 > --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c > +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c > @@ -777,7 +777,7 @@ static struct platform_driver brcm_avs_cpufreq_platdrv = { > .of_match_table = brcm_avs_cpufreq_match, > }, > .probe = brcm_avs_cpufreq_probe, > - .remove_new = brcm_avs_cpufreq_remove, > + .remove = brcm_avs_cpufreq_remove, > }; > module_platform_driver(brcm_avs_cpufreq_platdrv); > > diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c > index 983443396f8f..3a7c3372bda7 100644 > --- a/drivers/cpufreq/cpufreq-dt.c > +++ b/drivers/cpufreq/cpufreq-dt.c > @@ -345,7 +345,7 @@ static struct platform_driver dt_cpufreq_platdrv = { > .name = "cpufreq-dt", > }, > .probe = dt_cpufreq_probe, > - .remove_new = dt_cpufreq_remove, > + .remove = dt_cpufreq_remove, > }; > module_platform_driver(dt_cpufreq_platdrv); > > diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c > index 7d2754411d8c..8736be3a06ce 100644 > --- a/drivers/cpufreq/davinci-cpufreq.c > +++ b/drivers/cpufreq/davinci-cpufreq.c > @@ -145,7 +145,7 @@ static struct platform_driver davinci_cpufreq_driver = { > .driver = { > .name = "cpufreq-davinci", > }, > - .remove_new = __exit_p(davinci_cpufreq_remove), > + .remove = __exit_p(davinci_cpufreq_remove), > }; > > int __init davinci_cpufreq_init(void) > diff --git a/drivers/cpufreq/imx-cpufreq-dt.c b/drivers/cpufreq/imx-cpufreq-dt.c > index 577bb9e2f112..1492c92ffc1a 100644 > --- a/drivers/cpufreq/imx-cpufreq-dt.c > +++ b/drivers/cpufreq/imx-cpufreq-dt.c > @@ -183,7 +183,7 @@ static void imx_cpufreq_dt_remove(struct platform_device *pdev) > > static struct platform_driver imx_cpufreq_dt_driver = { > .probe = imx_cpufreq_dt_probe, > - .remove_new = imx_cpufreq_dt_remove, > + .remove = imx_cpufreq_dt_remove, > .driver = { > .name = "imx-cpufreq-dt", > }, > diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c > index c20d3ecc5a81..f3c99f378ad6 100644 > --- a/drivers/cpufreq/imx6q-cpufreq.c > +++ b/drivers/cpufreq/imx6q-cpufreq.c > @@ -522,7 +522,7 @@ static struct platform_driver imx6q_cpufreq_platdrv = { > .name = "imx6q-cpufreq", > }, > .probe = imx6q_cpufreq_probe, > - .remove_new = imx6q_cpufreq_remove, > + .remove = imx6q_cpufreq_remove, > }; > module_platform_driver(imx6q_cpufreq_platdrv); > > diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c > index fd20b986d1f2..312f2654d1d5 100644 > --- a/drivers/cpufreq/kirkwood-cpufreq.c > +++ b/drivers/cpufreq/kirkwood-cpufreq.c > @@ -189,7 +189,7 @@ static void kirkwood_cpufreq_remove(struct platform_device *pdev) > > static struct platform_driver kirkwood_cpufreq_platform_driver = { > .probe = kirkwood_cpufreq_probe, > - .remove_new = kirkwood_cpufreq_remove, > + .remove = kirkwood_cpufreq_remove, > .driver = { > .name = "kirkwood-cpufreq", > }, > diff --git a/drivers/cpufreq/loongson3_cpufreq.c b/drivers/cpufreq/loongson3_cpufreq.c > index 6b5e6798d9a2..61ebebf69455 100644 > --- a/drivers/cpufreq/loongson3_cpufreq.c > +++ b/drivers/cpufreq/loongson3_cpufreq.c > @@ -386,7 +386,7 @@ static struct platform_driver loongson3_platform_driver = { > }, > .id_table = cpufreq_id_table, > .probe = loongson3_cpufreq_probe, > - .remove_new = loongson3_cpufreq_remove, > + .remove = loongson3_cpufreq_remove, > }; > module_platform_driver(loongson3_platform_driver); > > diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c > index 8925e096d5b9..f7db5f4ad306 100644 > --- a/drivers/cpufreq/mediatek-cpufreq-hw.c > +++ b/drivers/cpufreq/mediatek-cpufreq-hw.c > @@ -344,7 +344,7 @@ MODULE_DEVICE_TABLE(of, mtk_cpufreq_hw_match); > > static struct platform_driver mtk_cpufreq_hw_driver = { > .probe = mtk_cpufreq_hw_driver_probe, > - .remove_new = mtk_cpufreq_hw_driver_remove, > + .remove = mtk_cpufreq_hw_driver_remove, > .driver = { > .name = "mtk-cpufreq-hw", > .of_match_table = mtk_cpufreq_hw_match, > diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c > index de8be0a8932d..106220c0fd11 100644 > --- a/drivers/cpufreq/omap-cpufreq.c > +++ b/drivers/cpufreq/omap-cpufreq.c > @@ -188,7 +188,7 @@ static struct platform_driver omap_cpufreq_platdrv = { > .name = "omap-cpufreq", > }, > .probe = omap_cpufreq_probe, > - .remove_new = omap_cpufreq_remove, > + .remove = omap_cpufreq_remove, > }; > module_platform_driver(omap_cpufreq_platdrv); > > diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c > index 771efbf51a48..ac2e90a65f0c 100644 > --- a/drivers/cpufreq/pcc-cpufreq.c > +++ b/drivers/cpufreq/pcc-cpufreq.c > @@ -615,7 +615,7 @@ static struct platform_driver pcc_cpufreq_platdrv = { > .driver = { > .name = "pcc-cpufreq", > }, > - .remove_new = pcc_cpufreq_remove, > + .remove = pcc_cpufreq_remove, > }; > > static int __init pcc_cpufreq_init(void) > diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c > index 900d6844c43d..98129565acb8 100644 > --- a/drivers/cpufreq/qcom-cpufreq-hw.c > +++ b/drivers/cpufreq/qcom-cpufreq-hw.c > @@ -736,7 +736,7 @@ static void qcom_cpufreq_hw_driver_remove(struct platform_device *pdev) > > static struct platform_driver qcom_cpufreq_hw_driver = { > .probe = qcom_cpufreq_hw_driver_probe, > - .remove_new = qcom_cpufreq_hw_driver_remove, > + .remove = qcom_cpufreq_hw_driver_remove, > .driver = { > .name = "qcom-cpufreq-hw", > .of_match_table = qcom_cpufreq_hw_match, > diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c > index ae556d5ba231..3a8ed723a23e 100644 > --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c > +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c > @@ -578,7 +578,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(qcom_cpufreq_pm_ops, qcom_cpufreq_suspend, NULL) > > static struct platform_driver qcom_cpufreq_driver = { > .probe = qcom_cpufreq_probe, > - .remove_new = qcom_cpufreq_remove, > + .remove = qcom_cpufreq_remove, > .driver = { > .name = "qcom-cpufreq-nvmem", > .pm = pm_sleep_ptr(&qcom_cpufreq_pm_ops), > diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c > index 3519bf34d397..a37ce051236c 100644 > --- a/drivers/cpufreq/qoriq-cpufreq.c > +++ b/drivers/cpufreq/qoriq-cpufreq.c > @@ -296,7 +296,7 @@ static struct platform_driver qoriq_cpufreq_platform_driver = { > .name = "qoriq-cpufreq", > }, > .probe = qoriq_cpufreq_probe, > - .remove_new = qoriq_cpufreq_remove, > + .remove = qoriq_cpufreq_remove, > }; > module_platform_driver(qoriq_cpufreq_platform_driver); > > diff --git a/drivers/cpufreq/raspberrypi-cpufreq.c b/drivers/cpufreq/raspberrypi-cpufreq.c > index e0705cc9a57d..5050932954e3 100644 > --- a/drivers/cpufreq/raspberrypi-cpufreq.c > +++ b/drivers/cpufreq/raspberrypi-cpufreq.c > @@ -85,7 +85,7 @@ static struct platform_driver raspberrypi_cpufreq_driver = { > .name = "raspberrypi-cpufreq", > }, > .probe = raspberrypi_cpufreq_probe, > - .remove_new = raspberrypi_cpufreq_remove, > + .remove = raspberrypi_cpufreq_remove, > }; > module_platform_driver(raspberrypi_cpufreq_driver); > > diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c > index 8d73e6e8be2a..cd89c1b9832c 100644 > --- a/drivers/cpufreq/scpi-cpufreq.c > +++ b/drivers/cpufreq/scpi-cpufreq.c > @@ -217,7 +217,7 @@ static struct platform_driver scpi_cpufreq_platdrv = { > .name = "scpi-cpufreq", > }, > .probe = scpi_cpufreq_probe, > - .remove_new = scpi_cpufreq_remove, > + .remove = scpi_cpufreq_remove, > }; > module_platform_driver(scpi_cpufreq_platdrv); > > diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c > index 293921acec93..352e1a69a85e 100644 > --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c > +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c > @@ -283,7 +283,7 @@ static void sun50i_cpufreq_nvmem_remove(struct platform_device *pdev) > > static struct platform_driver sun50i_cpufreq_driver = { > .probe = sun50i_cpufreq_nvmem_probe, > - .remove_new = sun50i_cpufreq_nvmem_remove, > + .remove = sun50i_cpufreq_nvmem_remove, > .driver = { > .name = "sun50i-cpufreq-nvmem", > }, > diff --git a/drivers/cpufreq/tegra186-cpufreq.c b/drivers/cpufreq/tegra186-cpufreq.c > index 7b8fcfa55038..c7761eb99f3c 100644 > --- a/drivers/cpufreq/tegra186-cpufreq.c > +++ b/drivers/cpufreq/tegra186-cpufreq.c > @@ -276,7 +276,7 @@ static struct platform_driver tegra186_cpufreq_platform_driver = { > .of_match_table = tegra186_cpufreq_of_match, > }, > .probe = tegra186_cpufreq_probe, > - .remove_new = tegra186_cpufreq_remove, > + .remove = tegra186_cpufreq_remove, > }; > module_platform_driver(tegra186_cpufreq_platform_driver); > > diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c > index 07ea7ed61b68..9055dd398e7f 100644 > --- a/drivers/cpufreq/tegra194-cpufreq.c > +++ b/drivers/cpufreq/tegra194-cpufreq.c > @@ -818,7 +818,7 @@ static struct platform_driver tegra194_ccplex_driver = { > .of_match_table = tegra194_cpufreq_of_match, > }, > .probe = tegra194_cpufreq_probe, > - .remove_new = tegra194_cpufreq_remove, > + .remove = tegra194_cpufreq_remove, > }; > module_platform_driver(tegra194_ccplex_driver); > > diff --git a/drivers/cpufreq/vexpress-spc-cpufreq.c b/drivers/cpufreq/vexpress-spc-cpufreq.c > index 3fadf536c429..0f86cdb7ec8a 100644 > --- a/drivers/cpufreq/vexpress-spc-cpufreq.c > +++ b/drivers/cpufreq/vexpress-spc-cpufreq.c > @@ -565,7 +565,7 @@ static struct platform_driver ve_spc_cpufreq_platdrv = { > .name = "vexpress-spc-cpufreq", > }, > .probe = ve_spc_cpufreq_probe, > - .remove_new = ve_spc_cpufreq_remove, > + .remove = ve_spc_cpufreq_remove, > }; > module_platform_driver(ve_spc_cpufreq_platdrv); > > > base-commit: f2493655d2d3d5c6958ed996b043c821c23ae8d3 > -- > 2.45.2 >
On 21-10-24, 12:20, Rafael J. Wysocki wrote: > On Sun, Oct 20, 2024 at 5:39 PM Uwe Kleine-König > <u.kleine-koenig@baylibre.com> wrote: > > > > 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/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 <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. Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > Viresh, > > I'll pick this up unless you'd prefer to apply it, so please let me know.
On Mon, Oct 21, 2024 at 12:22 PM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > On 21-10-24, 12:20, Rafael J. Wysocki wrote: > > On Sun, Oct 20, 2024 at 5:39 PM Uwe Kleine-König > > <u.kleine-koenig@baylibre.com> wrote: > > > > > > 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/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 <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. > > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > > > Viresh, > > > > I'll pick this up unless you'd prefer to apply it, so please let me know. Applied as 6.13 material, thanks!
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 0f04feb6cafa..433eb597c2b8 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -1028,7 +1028,7 @@ static struct platform_driver acpi_cpufreq_platdrv = { .driver = { .name = "acpi-cpufreq", }, - .remove_new = acpi_cpufreq_remove, + .remove = acpi_cpufreq_remove, }; static int __init acpi_cpufreq_init(void) diff --git a/drivers/cpufreq/brcmstb-avs-cpufreq.c b/drivers/cpufreq/brcmstb-avs-cpufreq.c index ea8438550b49..5d03a295a085 100644 --- a/drivers/cpufreq/brcmstb-avs-cpufreq.c +++ b/drivers/cpufreq/brcmstb-avs-cpufreq.c @@ -777,7 +777,7 @@ static struct platform_driver brcm_avs_cpufreq_platdrv = { .of_match_table = brcm_avs_cpufreq_match, }, .probe = brcm_avs_cpufreq_probe, - .remove_new = brcm_avs_cpufreq_remove, + .remove = brcm_avs_cpufreq_remove, }; module_platform_driver(brcm_avs_cpufreq_platdrv); diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index 983443396f8f..3a7c3372bda7 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -345,7 +345,7 @@ static struct platform_driver dt_cpufreq_platdrv = { .name = "cpufreq-dt", }, .probe = dt_cpufreq_probe, - .remove_new = dt_cpufreq_remove, + .remove = dt_cpufreq_remove, }; module_platform_driver(dt_cpufreq_platdrv); diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c index 7d2754411d8c..8736be3a06ce 100644 --- a/drivers/cpufreq/davinci-cpufreq.c +++ b/drivers/cpufreq/davinci-cpufreq.c @@ -145,7 +145,7 @@ static struct platform_driver davinci_cpufreq_driver = { .driver = { .name = "cpufreq-davinci", }, - .remove_new = __exit_p(davinci_cpufreq_remove), + .remove = __exit_p(davinci_cpufreq_remove), }; int __init davinci_cpufreq_init(void) diff --git a/drivers/cpufreq/imx-cpufreq-dt.c b/drivers/cpufreq/imx-cpufreq-dt.c index 577bb9e2f112..1492c92ffc1a 100644 --- a/drivers/cpufreq/imx-cpufreq-dt.c +++ b/drivers/cpufreq/imx-cpufreq-dt.c @@ -183,7 +183,7 @@ static void imx_cpufreq_dt_remove(struct platform_device *pdev) static struct platform_driver imx_cpufreq_dt_driver = { .probe = imx_cpufreq_dt_probe, - .remove_new = imx_cpufreq_dt_remove, + .remove = imx_cpufreq_dt_remove, .driver = { .name = "imx-cpufreq-dt", }, diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index c20d3ecc5a81..f3c99f378ad6 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c @@ -522,7 +522,7 @@ static struct platform_driver imx6q_cpufreq_platdrv = { .name = "imx6q-cpufreq", }, .probe = imx6q_cpufreq_probe, - .remove_new = imx6q_cpufreq_remove, + .remove = imx6q_cpufreq_remove, }; module_platform_driver(imx6q_cpufreq_platdrv); diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c index fd20b986d1f2..312f2654d1d5 100644 --- a/drivers/cpufreq/kirkwood-cpufreq.c +++ b/drivers/cpufreq/kirkwood-cpufreq.c @@ -189,7 +189,7 @@ static void kirkwood_cpufreq_remove(struct platform_device *pdev) static struct platform_driver kirkwood_cpufreq_platform_driver = { .probe = kirkwood_cpufreq_probe, - .remove_new = kirkwood_cpufreq_remove, + .remove = kirkwood_cpufreq_remove, .driver = { .name = "kirkwood-cpufreq", }, diff --git a/drivers/cpufreq/loongson3_cpufreq.c b/drivers/cpufreq/loongson3_cpufreq.c index 6b5e6798d9a2..61ebebf69455 100644 --- a/drivers/cpufreq/loongson3_cpufreq.c +++ b/drivers/cpufreq/loongson3_cpufreq.c @@ -386,7 +386,7 @@ static struct platform_driver loongson3_platform_driver = { }, .id_table = cpufreq_id_table, .probe = loongson3_cpufreq_probe, - .remove_new = loongson3_cpufreq_remove, + .remove = loongson3_cpufreq_remove, }; module_platform_driver(loongson3_platform_driver); diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c index 8925e096d5b9..f7db5f4ad306 100644 --- a/drivers/cpufreq/mediatek-cpufreq-hw.c +++ b/drivers/cpufreq/mediatek-cpufreq-hw.c @@ -344,7 +344,7 @@ MODULE_DEVICE_TABLE(of, mtk_cpufreq_hw_match); static struct platform_driver mtk_cpufreq_hw_driver = { .probe = mtk_cpufreq_hw_driver_probe, - .remove_new = mtk_cpufreq_hw_driver_remove, + .remove = mtk_cpufreq_hw_driver_remove, .driver = { .name = "mtk-cpufreq-hw", .of_match_table = mtk_cpufreq_hw_match, diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index de8be0a8932d..106220c0fd11 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c @@ -188,7 +188,7 @@ static struct platform_driver omap_cpufreq_platdrv = { .name = "omap-cpufreq", }, .probe = omap_cpufreq_probe, - .remove_new = omap_cpufreq_remove, + .remove = omap_cpufreq_remove, }; module_platform_driver(omap_cpufreq_platdrv); diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c index 771efbf51a48..ac2e90a65f0c 100644 --- a/drivers/cpufreq/pcc-cpufreq.c +++ b/drivers/cpufreq/pcc-cpufreq.c @@ -615,7 +615,7 @@ static struct platform_driver pcc_cpufreq_platdrv = { .driver = { .name = "pcc-cpufreq", }, - .remove_new = pcc_cpufreq_remove, + .remove = pcc_cpufreq_remove, }; static int __init pcc_cpufreq_init(void) diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c index 900d6844c43d..98129565acb8 100644 --- a/drivers/cpufreq/qcom-cpufreq-hw.c +++ b/drivers/cpufreq/qcom-cpufreq-hw.c @@ -736,7 +736,7 @@ static void qcom_cpufreq_hw_driver_remove(struct platform_device *pdev) static struct platform_driver qcom_cpufreq_hw_driver = { .probe = qcom_cpufreq_hw_driver_probe, - .remove_new = qcom_cpufreq_hw_driver_remove, + .remove = qcom_cpufreq_hw_driver_remove, .driver = { .name = "qcom-cpufreq-hw", .of_match_table = qcom_cpufreq_hw_match, diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c index ae556d5ba231..3a8ed723a23e 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c @@ -578,7 +578,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(qcom_cpufreq_pm_ops, qcom_cpufreq_suspend, NULL) static struct platform_driver qcom_cpufreq_driver = { .probe = qcom_cpufreq_probe, - .remove_new = qcom_cpufreq_remove, + .remove = qcom_cpufreq_remove, .driver = { .name = "qcom-cpufreq-nvmem", .pm = pm_sleep_ptr(&qcom_cpufreq_pm_ops), diff --git a/drivers/cpufreq/qoriq-cpufreq.c b/drivers/cpufreq/qoriq-cpufreq.c index 3519bf34d397..a37ce051236c 100644 --- a/drivers/cpufreq/qoriq-cpufreq.c +++ b/drivers/cpufreq/qoriq-cpufreq.c @@ -296,7 +296,7 @@ static struct platform_driver qoriq_cpufreq_platform_driver = { .name = "qoriq-cpufreq", }, .probe = qoriq_cpufreq_probe, - .remove_new = qoriq_cpufreq_remove, + .remove = qoriq_cpufreq_remove, }; module_platform_driver(qoriq_cpufreq_platform_driver); diff --git a/drivers/cpufreq/raspberrypi-cpufreq.c b/drivers/cpufreq/raspberrypi-cpufreq.c index e0705cc9a57d..5050932954e3 100644 --- a/drivers/cpufreq/raspberrypi-cpufreq.c +++ b/drivers/cpufreq/raspberrypi-cpufreq.c @@ -85,7 +85,7 @@ static struct platform_driver raspberrypi_cpufreq_driver = { .name = "raspberrypi-cpufreq", }, .probe = raspberrypi_cpufreq_probe, - .remove_new = raspberrypi_cpufreq_remove, + .remove = raspberrypi_cpufreq_remove, }; module_platform_driver(raspberrypi_cpufreq_driver); diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c index 8d73e6e8be2a..cd89c1b9832c 100644 --- a/drivers/cpufreq/scpi-cpufreq.c +++ b/drivers/cpufreq/scpi-cpufreq.c @@ -217,7 +217,7 @@ static struct platform_driver scpi_cpufreq_platdrv = { .name = "scpi-cpufreq", }, .probe = scpi_cpufreq_probe, - .remove_new = scpi_cpufreq_remove, + .remove = scpi_cpufreq_remove, }; module_platform_driver(scpi_cpufreq_platdrv); diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c index 293921acec93..352e1a69a85e 100644 --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c @@ -283,7 +283,7 @@ static void sun50i_cpufreq_nvmem_remove(struct platform_device *pdev) static struct platform_driver sun50i_cpufreq_driver = { .probe = sun50i_cpufreq_nvmem_probe, - .remove_new = sun50i_cpufreq_nvmem_remove, + .remove = sun50i_cpufreq_nvmem_remove, .driver = { .name = "sun50i-cpufreq-nvmem", }, diff --git a/drivers/cpufreq/tegra186-cpufreq.c b/drivers/cpufreq/tegra186-cpufreq.c index 7b8fcfa55038..c7761eb99f3c 100644 --- a/drivers/cpufreq/tegra186-cpufreq.c +++ b/drivers/cpufreq/tegra186-cpufreq.c @@ -276,7 +276,7 @@ static struct platform_driver tegra186_cpufreq_platform_driver = { .of_match_table = tegra186_cpufreq_of_match, }, .probe = tegra186_cpufreq_probe, - .remove_new = tegra186_cpufreq_remove, + .remove = tegra186_cpufreq_remove, }; module_platform_driver(tegra186_cpufreq_platform_driver); diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c index 07ea7ed61b68..9055dd398e7f 100644 --- a/drivers/cpufreq/tegra194-cpufreq.c +++ b/drivers/cpufreq/tegra194-cpufreq.c @@ -818,7 +818,7 @@ static struct platform_driver tegra194_ccplex_driver = { .of_match_table = tegra194_cpufreq_of_match, }, .probe = tegra194_cpufreq_probe, - .remove_new = tegra194_cpufreq_remove, + .remove = tegra194_cpufreq_remove, }; module_platform_driver(tegra194_ccplex_driver); diff --git a/drivers/cpufreq/vexpress-spc-cpufreq.c b/drivers/cpufreq/vexpress-spc-cpufreq.c index 3fadf536c429..0f86cdb7ec8a 100644 --- a/drivers/cpufreq/vexpress-spc-cpufreq.c +++ b/drivers/cpufreq/vexpress-spc-cpufreq.c @@ -565,7 +565,7 @@ static struct platform_driver ve_spc_cpufreq_platdrv = { .name = "vexpress-spc-cpufreq", }, .probe = ve_spc_cpufreq_probe, - .remove_new = ve_spc_cpufreq_remove, + .remove = ve_spc_cpufreq_remove, }; module_platform_driver(ve_spc_cpufreq_platdrv);
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/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 <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/cpufreq/acpi-cpufreq.c | 2 +- drivers/cpufreq/brcmstb-avs-cpufreq.c | 2 +- drivers/cpufreq/cpufreq-dt.c | 2 +- drivers/cpufreq/davinci-cpufreq.c | 2 +- drivers/cpufreq/imx-cpufreq-dt.c | 2 +- drivers/cpufreq/imx6q-cpufreq.c | 2 +- drivers/cpufreq/kirkwood-cpufreq.c | 2 +- drivers/cpufreq/loongson3_cpufreq.c | 2 +- drivers/cpufreq/mediatek-cpufreq-hw.c | 2 +- drivers/cpufreq/omap-cpufreq.c | 2 +- drivers/cpufreq/pcc-cpufreq.c | 2 +- drivers/cpufreq/qcom-cpufreq-hw.c | 2 +- drivers/cpufreq/qcom-cpufreq-nvmem.c | 2 +- drivers/cpufreq/qoriq-cpufreq.c | 2 +- drivers/cpufreq/raspberrypi-cpufreq.c | 2 +- drivers/cpufreq/scpi-cpufreq.c | 2 +- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 2 +- drivers/cpufreq/tegra186-cpufreq.c | 2 +- drivers/cpufreq/tegra194-cpufreq.c | 2 +- drivers/cpufreq/vexpress-spc-cpufreq.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) base-commit: f2493655d2d3d5c6958ed996b043c821c23ae8d3