From ad6dede7e1317f01d7f6bc7299a4057e1c04db06 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 14 Sep 2024 15:31:36 +0200 Subject: [PATCH] meson64-6.12: hackfix for meson-gx-socinfo patch 2 - 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, | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ``` --- ...c-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/patch/kernel/archive/meson64-6.12/general-soc-0002-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch b/patch/kernel/archive/meson64-6.12/general-soc-0002-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch index ebdc92555ab9..c198f0427718 100644 --- a/patch/kernel/archive/meson64-6.12/general-soc-0002-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch +++ b/patch/kernel/archive/meson64-6.12/general-soc-0002-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch @@ -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 --- 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[] = {