MIRRORS/meta-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/meta-imx.git synced 2025-07-19 18:39:09 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "cockpit: linux-imx: Fix -Wincompatible-pointer-types [YOCIMX-8508]"

Browse Source 
This reverts commit ca09ecd51a.
This commit is contained in:
Tom Hochstein 2024-11-13 11:07:26 -06:00
parent 5122c9cd99
commit d57b14a35f
2 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meta-imx-cockpit/recipes-kernel/linux/linux-imx/0001-YOCIMX-8508-net-imx-shmem-net-Fix-Wincompatible-poin.patch
View File

@ -1,45 +0,0 @@
From d54567585f7cc475fb1298f53d05f53d653dbb20 Mon Sep 17 00:00:00 2001
From: Nitin Garg <nitin.garg_3@nxp.com>
Date: Tue, 12 Nov 2024 12:42:32 -0600
Subject: [PATCH] YOCIMX-8508 net: imx-shmem-net: Fix
-Wincompatible-pointer-types
Fixes build break:
```
drivers/net/imx-shmem-net.c:1259:27: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Wincompatible-pointer-types]
1259 | .remove = imx_shm_net_remove,
| ^~~~~~~~~~~~~~~~~~
```
Upstream-Status: Pending
Signed-off-by: Nitin Garg <nitin.garg_3@nxp.com>
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
drivers/net/imx-shmem-net.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/imx-shmem-net.c b/drivers/net/imx-shmem-net.c
index 4db888c7c597..2556636a1230 100644
--- a/drivers/net/imx-shmem-net.c
+++ b/drivers/net/imx-shmem-net.c
@@ -1188,7 +1188,7 @@ static int imx_shm_net_probe(struct platform_device *pdev)
return ret;
}
-static int imx_shm_net_remove(struct platform_device *pdev)
+static void imx_shm_net_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct imx_shm_net *in = netdev_priv(ndev);
@@ -1217,8 +1217,6 @@ static int imx_shm_net_remove(struct platform_device *pdev)
cancel_work_sync(&in->state_work);
destroy_workqueue(in->state_wq);
free_netdev(ndev);
-
- return 0;
}
#ifdef CONFIG_PM_SLEEP
--
2.34.1

2
meta-imx-cockpit/recipes-kernel/linux/linux-imx_%.bbappend
View File

@ -1,5 +1,3 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI:append = " file://0001-YOCIMX-8508-net-imx-shmem-net-Fix-Wincompatible-poin.patch"
do_copy_defconfig:append:imx8qm-cockpit () {