layerscape: ppfe: use remove_new
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>
This commit is contained in:
parent
d183da890b
commit
745b720c6b
1 changed files with 4 additions and 7 deletions
|
@ -10254,7 +10254,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
|
||||||
+#endif /* _PFE_HW_H_ */
|
+#endif /* _PFE_HW_H_ */
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
+++ b/drivers/staging/fsl_ppfe/pfe_ls1012a_platform.c
|
||||||
@@ -0,0 +1,383 @@
|
@@ -0,0 +1,380 @@
|
||||||
+// SPDX-License-Identifier: GPL-2.0+
|
+// SPDX-License-Identifier: GPL-2.0+
|
||||||
+/*
|
+/*
|
||||||
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
|
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
|
||||||
|
@ -10516,14 +10516,13 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
|
||||||
+/*
|
+/*
|
||||||
+ * pfe_platform_remove -
|
+ * 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);
|
+ struct pfe *pfe = platform_get_drvdata(pdev);
|
||||||
+ int rc;
|
|
||||||
+
|
+
|
||||||
+ pr_info("%s\n", __func__);
|
+ pr_info("%s\n", __func__);
|
||||||
+
|
+
|
||||||
+ rc = pfe_remove(pfe);
|
+ pfe_remove(pfe);
|
||||||
+
|
+
|
||||||
+ iounmap(pfe->cbus_baseaddr);
|
+ iounmap(pfe->cbus_baseaddr);
|
||||||
+
|
+
|
||||||
|
@ -10532,8 +10531,6 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
|
||||||
+ platform_set_drvdata(pdev, NULL);
|
+ platform_set_drvdata(pdev, NULL);
|
||||||
+
|
+
|
||||||
+ kfree(pfe);
|
+ kfree(pfe);
|
||||||
+
|
|
||||||
+ return rc;
|
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+#ifdef CONFIG_PM
|
+#ifdef CONFIG_PM
|
||||||
|
@ -10624,7 +10621,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
|
||||||
+
|
+
|
||||||
+static struct platform_driver pfe_platform_driver = {
|
+static struct platform_driver pfe_platform_driver = {
|
||||||
+ .probe = pfe_platform_probe,
|
+ .probe = pfe_platform_probe,
|
||||||
+ .remove = pfe_platform_remove,
|
+ .remove_new = pfe_platform_remove,
|
||||||
+ .driver = {
|
+ .driver = {
|
||||||
+ .name = "pfe",
|
+ .name = "pfe",
|
||||||
+ .of_match_table = pfe_match,
|
+ .of_match_table = pfe_match,
|
||||||
|
|
Loading…
Reference in a new issue