On Fri, Oct 25, 2024 at 03:13:41PM +0200, Uwe Kleine-König 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/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@xxxxxxxxxxxx>
> ---
> Hello,
>
> I did a single patch for all of drivers/remoteproc. While I usually
> prefer to do one logical change per patch, this seems to be
> overengineering here as the individual changes are really trivial and
> shouldn't be much in the way for stable backports. But I'll happily
> split the patch if you prefer it split.
>
> Note I didn't Cc: the maintainers of each driver as this would hit
> sending limits.
>
> This is based on today's next, if conflicts arise when you apply it at
> some later time and don't want to resolve them, feel free to just drop
> the changes to the conflicting files. I'll notice and followup at a
> later time then. Or ask me for a fixed resend.
>
> Best regards
> Uwe
>
> drivers/remoteproc/da8xx_remoteproc.c | 2 +-
> drivers/remoteproc/imx_dsp_rproc.c | 2 +-
> drivers/remoteproc/imx_rproc.c | 2 +-
> drivers/remoteproc/keystone_remoteproc.c | 2 +-
> drivers/remoteproc/meson_mx_ao_arc.c | 2 +-
> drivers/remoteproc/mtk_scp.c | 2 +-
> drivers/remoteproc/pru_rproc.c | 2 +-
> drivers/remoteproc/qcom_q6v5_adsp.c | 2 +-
> drivers/remoteproc/qcom_q6v5_mss.c | 2 +-
> drivers/remoteproc/qcom_q6v5_pas.c | 2 +-
> drivers/remoteproc/qcom_q6v5_wcss.c | 2 +-
> drivers/remoteproc/qcom_wcnss.c | 2 +-
> drivers/remoteproc/rcar_rproc.c | 2 +-
> drivers/remoteproc/remoteproc_virtio.c | 2 +-
> drivers/remoteproc/st_remoteproc.c | 2 +-
> drivers/remoteproc/stm32_rproc.c | 2 +-
> drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +-
> drivers/remoteproc/wkup_m3_rproc.c | 2 +-
> 18 files changed, 18 insertions(+), 18 deletions(-)
I have applied this patch.
Regards,
Mathieu
>
> diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c
> index 7daaab8124e8..93031f0867d1 100644
> --- 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 376187ad5754..ea5024919c2f 100644
> --- 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 800015ff7ff9..74299af1d7f1 100644
> --- 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 8f0f7a4cfef2..6e54093d1732 100644
> --- 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 f6744b538323..7dfdf11b0036 100644
> --- 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 e744c07507ee..0f4a7065d0bd 100644
> --- 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 327f0c7ee3d6..1656574b7317 100644
> --- 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 572dcb0f055b..cbd9a914880b 100644
> --- 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 2a42215ce8e0..103368d11a96 100644
> --- 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 ef82835e98a4..297ef0c69054 100644
> --- 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 e913dabae992..810441f43396 100644
> --- 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 a7bb9da27029..5b5664603eed 100644
> --- 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 cc17e8421f65..921d853594f4 100644
> --- 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 d3f39009b28e..25a655f33ec0 100644
> --- 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 1340be9d0110..5df99bae7131 100644
> --- 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 8c7f7950b80e..b02b36a3f515 100644
> --- 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 d08a3a98ada1..aed88a5061cc 100644
> --- 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 36a55f7ffa64..d8be21e71721 100644
> --- 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,
>
> base-commit: a39230ecf6b3057f5897bc4744a790070cfbe7a8
> --
> 2.45.2
>
