[openwrt/openwrt] layerscape: ppfe: use remove_new

LEDE Commits lede-commits at lists.infradead.org
Thu May 1 16:34:37 PDT 2025


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/745b720c6b457b46cfe06aa95bab6972ca4055fe

commit 745b720c6b457b46cfe06aa95bab6972ca4055fe
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sat Apr 26 15:48:16 2025 -0700

    layerscape: ppfe: use remove_new
    
    Easy compability fix for kernel 6.12.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/18660
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 .../patches-6.6/701-staging-add-fsl_ppfe-driver.patch         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/target/linux/layerscape/patches-6.6/701-staging-add-fsl_ppfe-driver.patch b/target/linux/layerscape/patches-6.6/701-staging-add-fsl_ppfe-driver.patch
index 764d29f10d..80ba992abc 100644
--- a/target/linux/layerscape/patches-6.6/701-staging-add-fsl_ppfe-driver.patch
+++ b/target/linux/layerscape/patches-6.6/701-staging-add-fsl_ppfe-driver.patch
@@ -10254,7 +10254,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong at nxp.com>
 +#endif /* _PFE_HW_H_ */
 --- /dev/null
 +++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
-@@ -0,0 +1,383 @@
+@@ -0,0 +1,380 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Copyright 2015-2016 Freescale Semiconductor, Inc.
@@ -10516,14 +10516,13 @@ Signed-off-by: Dong Aisheng <aisheng.dong at nxp.com>
 +/*
 + * pfe_platform_remove -
 + */
-+static int pfe_platform_remove(struct platform_device *pdev)
++static void pfe_platform_remove(struct platform_device *pdev)
 +{
 +	struct pfe *pfe = platform_get_drvdata(pdev);
-+	int rc;
 +
 +	pr_info("%s\n", __func__);
 +
-+	rc = pfe_remove(pfe);
++	pfe_remove(pfe);
 +
 +	iounmap(pfe->cbus_baseaddr);
 +
@@ -10532,8 +10531,6 @@ Signed-off-by: Dong Aisheng <aisheng.dong at nxp.com>
 +	platform_set_drvdata(pdev, NULL);
 +
 +	kfree(pfe);
-+
-+	return rc;
 +}
 +
 +#ifdef CONFIG_PM
@@ -10624,7 +10621,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong at nxp.com>
 +
 +static struct platform_driver pfe_platform_driver = {
 +	.probe = pfe_platform_probe,
-+	.remove = pfe_platform_remove,
++	.remove_new = pfe_platform_remove,
 +	.driver = {
 +		.name = "pfe",
 +		.of_match_table = pfe_match,




More information about the lede-commits mailing list