remoteproc: 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/remoteproc 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>
Link: https://lore.kernel.org/r/20241025131340.258233-2-u.kleine-koenig@baylibre.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c
index 7daaab8124e857e50201f16ab445115ea96c8abc..93031f0867d10669e0373cd95cdcf1a2dbb3ab26 100644 (file)
--- a/drivers/remoteproc/da8xx_remoteproc.c
+++ b/drivers/remoteproc/da8xx_remoteproc.c
@@ -365,7 +365,7 @@ MODULE_DEVICE_TABLE(of, davinci_rproc_of_match);
 
 static struct platform_driver da8xx_rproc_driver = {
        .probe = da8xx_rproc_probe,
-       .remove_new = da8xx_rproc_remove,
+       .remove = da8xx_rproc_remove,
        .driver = {
                .name = "davinci-rproc",
                .of_match_table = of_match_ptr(davinci_rproc_of_match),

diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index 376187ad5754cdd87fe14b453e07f3f8362ca533..ea5024919c2ffc9efb8816cba48e25d539c809bc 100644 (file)
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -1258,7 +1258,7 @@ MODULE_DEVICE_TABLE(of, imx_dsp_rproc_of_match);
 
 static struct platform_driver imx_dsp_rproc_driver = {
        .probe = imx_dsp_rproc_probe,
-       .remove_new = imx_dsp_rproc_remove,
+       .remove = imx_dsp_rproc_remove,
        .driver = {
                .name = "imx-dsp-rproc",
                .of_match_table = imx_dsp_rproc_of_match,

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 800015ff7ff92366486021e772f19426a7f9bb25..74299af1d7f10a0db794de494c52304b2323b89f 100644 (file)
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -1198,7 +1198,7 @@ MODULE_DEVICE_TABLE(of, imx_rproc_of_match);
 
 static struct platform_driver imx_rproc_driver = {
        .probe = imx_rproc_probe,
-       .remove_new = imx_rproc_remove,
+       .remove = imx_rproc_remove,
        .driver = {
                .name = "imx-rproc",
                .of_match_table = imx_rproc_of_match,

diff --git a/drivers/remoteproc/keystone_remoteproc.c b/drivers/remoteproc/keystone_remoteproc.c
index 8f0f7a4cfef26231728e0a1671443ff1050d83db..6e54093d1732314d234e85bf6cf7fb6f1d9bf994 100644 (file)
--- a/drivers/remoteproc/keystone_remoteproc.c
+++ b/drivers/remoteproc/keystone_remoteproc.c
@@ -490,7 +490,7 @@ MODULE_DEVICE_TABLE(of, keystone_rproc_of_match);
 
 static struct platform_driver keystone_rproc_driver = {
        .probe  = keystone_rproc_probe,
-       .remove_new = keystone_rproc_remove,
+       .remove = keystone_rproc_remove,
        .driver = {
                .name = "keystone-rproc",
                .of_match_table = keystone_rproc_of_match,

diff --git a/drivers/remoteproc/meson_mx_ao_arc.c b/drivers/remoteproc/meson_mx_ao_arc.c
index f6744b53832308a2b2a45455ecab1535ffa20cd8..7dfdf11b00368e207afe8513bd9fb704e6cfa869 100644 (file)
--- a/drivers/remoteproc/meson_mx_ao_arc.c
+++ b/drivers/remoteproc/meson_mx_ao_arc.c
@@ -246,7 +246,7 @@ MODULE_DEVICE_TABLE(of, meson_mx_ao_arc_rproc_match);
 
 static struct platform_driver meson_mx_ao_arc_rproc_driver = {
        .probe = meson_mx_ao_arc_rproc_probe,
-       .remove_new = meson_mx_ao_arc_rproc_remove,
+       .remove = meson_mx_ao_arc_rproc_remove,
        .driver = {
                .name = "meson-mx-ao-arc-rproc",
                .of_match_table = meson_mx_ao_arc_rproc_match,

diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index e744c07507eedefd465c4678d2512546801cd841..0f4a7065d0bd9e7f00931b1207499420cdc37f8f 100644 (file)
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -1521,7 +1521,7 @@ MODULE_DEVICE_TABLE(of, mtk_scp_of_match);
 
 static struct platform_driver mtk_scp_driver = {
        .probe = scp_probe,
-       .remove_new = scp_remove,
+       .remove = scp_remove,
        .driver = {
                .name = "mtk-scp",
                .of_match_table = mtk_scp_of_match,

diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
index 327f0c7ee3d6ba59e20e4e4a2cc1ac2ce1a5b27a..1656574b73175aca4e6f69d02606213a0140d5b9 100644 (file)
--- a/drivers/remoteproc/pru_rproc.c
+++ b/drivers/remoteproc/pru_rproc.c
@@ -1132,7 +1132,7 @@ static struct platform_driver pru_rproc_driver = {
                .suppress_bind_attrs = true,
        },
        .probe  = pru_rproc_probe,
-       .remove_new = pru_rproc_remove,
+       .remove = pru_rproc_remove,
 };
 module_platform_driver(pru_rproc_driver);
 

diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
index 572dcb0f055b764f36d0da7c851dcc707bb5ff6e..cbd9a914880bac8e34759c54d4f5e26b37ecd754 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@ -840,7 +840,7 @@ MODULE_DEVICE_TABLE(of, adsp_of_match);
 
 static struct platform_driver adsp_pil_driver = {
        .probe = adsp_probe,
-       .remove_new = adsp_remove,
+       .remove = adsp_remove,
        .driver = {
                .name = "qcom_q6v5_adsp",
                .of_match_table = adsp_of_match,

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index 2a42215ce8e07b25cb45e708aa62f9ebe83bb88c..103368d11a96e23d33ebadaecc8c817bdf47621d 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -2533,7 +2533,7 @@ MODULE_DEVICE_TABLE(of, q6v5_of_match);
 
 static struct platform_driver q6v5_driver = {
        .probe = q6v5_probe,
-       .remove_new = q6v5_remove,
+       .remove = q6v5_remove,
        .driver = {
                .name = "qcom-q6v5-mss",
                .of_match_table = q6v5_of_match,

diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index ef82835e98a4efd4bc603cff604d531a51fe9f9c..297ef0c69054de34f0bfb25d862580176199bfa4 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -1477,7 +1477,7 @@ MODULE_DEVICE_TABLE(of, adsp_of_match);
 
 static struct platform_driver adsp_driver = {
        .probe = adsp_probe,
-       .remove_new = adsp_remove,
+       .remove = adsp_remove,
        .driver = {
                .name = "qcom_q6v5_pas",
                .of_match_table = adsp_of_match,

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index e913dabae99245da60404461240ebeaebded67eb..810441f43396f595c70aef2243f4d1bd8c446ee8 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -1111,7 +1111,7 @@ MODULE_DEVICE_TABLE(of, q6v5_wcss_of_match);
 
 static struct platform_driver q6v5_wcss_driver = {
        .probe = q6v5_wcss_probe,
-       .remove_new = q6v5_wcss_remove,
+       .remove = q6v5_wcss_remove,
        .driver = {
                .name = "qcom-q6v5-wcss-pil",
                .of_match_table = q6v5_wcss_of_match,

diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c
index a7bb9da27029db23f3759b19e423fab11b8430e4..5b5664603eed293a1086a302564111d6203b17ca 100644 (file)
--- a/drivers/remoteproc/qcom_wcnss.c
+++ b/drivers/remoteproc/qcom_wcnss.c
@@ -682,7 +682,7 @@ MODULE_DEVICE_TABLE(of, wcnss_of_match);
 
 static struct platform_driver wcnss_driver = {
        .probe = wcnss_probe,
-       .remove_new = wcnss_remove,
+       .remove = wcnss_remove,
        .driver = {
                .name = "qcom-wcnss-pil",
                .of_match_table = wcnss_of_match,

diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rproc.c
index cc17e8421f65bf7e02c68ce7c47c3b4fce732b26..921d853594f42f4a86113b9b46153bc6b3db3410 100644 (file)
--- a/drivers/remoteproc/rcar_rproc.c
+++ b/drivers/remoteproc/rcar_rproc.c
@@ -214,7 +214,7 @@ MODULE_DEVICE_TABLE(of, rcar_rproc_of_match);
 
 static struct platform_driver rcar_rproc_driver = {
        .probe = rcar_rproc_probe,
-       .remove_new = rcar_rproc_remove,
+       .remove = rcar_rproc_remove,
        .driver = {
                .name = "rcar-rproc",
                .of_match_table = rcar_rproc_of_match,

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index d3f39009b28ed27d11b4ac920616667362a77854..25a655f33ec0ed76b9a90dd31de244832d82c2a7 100644 (file)
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -593,7 +593,7 @@ static void rproc_virtio_remove(struct platform_device *pdev)
 /* Platform driver */
 static struct platform_driver rproc_virtio_driver = {
        .probe          = rproc_virtio_probe,
-       .remove_new     = rproc_virtio_remove,
+       .remove         = rproc_virtio_remove,
        .driver         = {
                .name   = "rproc-virtio",
        },

diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c
index 1340be9d0110175c41318208ece611d882da2399..5df99bae7131a832c0c03c9bf8619812d9eb570d 100644 (file)
--- a/drivers/remoteproc/st_remoteproc.c
+++ b/drivers/remoteproc/st_remoteproc.c
@@ -457,7 +457,7 @@ static void st_rproc_remove(struct platform_device *pdev)
 
 static struct platform_driver st_rproc_driver = {
        .probe = st_rproc_probe,
-       .remove_new = st_rproc_remove,
+       .remove = st_rproc_remove,
        .driver = {
                .name = "st-rproc",
                .of_match_table = of_match_ptr(st_rproc_match),

diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index 8c7f7950b80eee53e05045576382eac7a5f0dbe6..b02b36a3f515644a7b8a6a079461ab3ec27be663 100644 (file)
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -946,7 +946,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(stm32_rproc_pm_ops,
 
 static struct platform_driver stm32_rproc_driver = {
        .probe = stm32_rproc_probe,
-       .remove_new = stm32_rproc_remove,
+       .remove = stm32_rproc_remove,
        .driver = {
                .name = "stm32-rproc",
                .pm = pm_ptr(&stm32_rproc_pm_ops),

diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
index ffb46c64170ac7ffedb7d06e4ca42c52cdb58c9b..a695890254ff7622aa950b7d6ceb5e3f86fc82ab 100644 (file)
--- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
@@ -791,7 +791,7 @@ MODULE_DEVICE_TABLE(of, k3_dsp_of_match);
 
 static struct platform_driver k3_dsp_rproc_driver = {
        .probe  = k3_dsp_rproc_probe,
-       .remove_new = k3_dsp_rproc_remove,
+       .remove = k3_dsp_rproc_remove,
        .driver = {
                .name = "k3-dsp-rproc",
                .of_match_table = k3_dsp_of_match,

diff --git a/drivers/remoteproc/wkup_m3_rproc.c b/drivers/remoteproc/wkup_m3_rproc.c
index 36a55f7ffa64d535cd832af8ce4ea28da505f368..d8be21e717212a2acb01cd68693c03ebeb12da44 100644 (file)
--- a/drivers/remoteproc/wkup_m3_rproc.c
+++ b/drivers/remoteproc/wkup_m3_rproc.c
@@ -251,7 +251,7 @@ static const struct dev_pm_ops wkup_m3_rproc_pm_ops = {
 
 static struct platform_driver wkup_m3_rproc_driver = {
        .probe = wkup_m3_rproc_probe,
-       .remove_new = wkup_m3_rproc_remove,
+       .remove = wkup_m3_rproc_remove,
        .driver = {
                .name = "wkup_m3_rproc",
                .of_match_table = wkup_m3_rproc_of_match,