From 745b720c6b457b46cfe06aa95bab6972ca4055fe Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 26 Apr 2025 15:48:16 -0700 Subject: [PATCH] layerscape: ppfe: use remove_new Easy compability fix for kernel 6.12. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/18660 Signed-off-by: Christian Marangi --- .../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 764d29f10d9..80ba992abc2 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 +#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 +/* + * 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 + platform_set_drvdata(pdev, NULL); + + kfree(pfe); -+ -+ return rc; +} + +#ifdef CONFIG_PM @@ -10624,7 +10621,7 @@ Signed-off-by: Dong Aisheng + +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, -- 2.47.2