]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
layerscape: ppfe: use remove_new
authorRosen Penev <rosenp@gmail.com>
Sat, 26 Apr 2025 22:48:16 +0000 (15:48 -0700)
committerChristian Marangi <ansuelsmth@gmail.com>
Thu, 1 May 2025 23:34:21 +0000 (01:34 +0200)
Easy compability fix for kernel 6.12.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18660
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
target/linux/layerscape/patches-6.6/701-staging-add-fsl_ppfe-driver.patch

index 764d29f10d9e175028f922a66c277fb78451e99c..80ba992abc2b8aa720d6ef0d357cdbcc206ea784 100644 (file)
@@ -10254,7 +10254,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@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@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@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@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,