JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

meson64-6.12: hackfix for meson-gx-socinfo patch 2

Browse Source 
- original from 6.11, re-done on top of Viacheslav's 6.12 fix which missed it
- otherwise
  ```
  drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
       178 |         .remove = meson_gx_socinfo_sm_remove,
           |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
  ```
This commit is contained in:
Ricardo Pardini
2024-09-14 15:31:36 +02:00
parent 795d8f4808
commit 333d99ca25
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patch/kernel/archive/meson64-6.12/general-soc-0002-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch
View File

@@ -10,6 +10,8 @@ This patchs adds support for secure-monitor call decoding and exposing
with the SoC bus infrastructure in addition to the previous SoC
Information driver.
- rpardini: hack to fix "initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)'"
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
---
drivers/soc/amlogic/Kconfig | 10 +
@@ -241,12 +243,12 @@ index 000000000000..111111111111
+}
+
+
+static int meson_gx_socinfo_sm_remove(struct platform_device *pdev)
+static void meson_gx_socinfo_sm_remove(struct platform_device *pdev)
+{
+ struct soc_device *soc_dev = platform_get_drvdata(pdev);
+
+ soc_device_unregister(soc_dev);
+ return 0;
+ // return 0;
+}
+
+static const struct of_device_id meson_gx_socinfo_match[] = {