Skip to content

Commit

Permalink
meson64-6.12: hackfix for meson-gx-socinfo patch 2
Browse files Browse the repository at this point in the history
- 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,
           |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
  ```
  • Loading branch information
rpardini committed Nov 18, 2024
1 parent f1f3c12 commit ad6dede
Showing 1 changed file with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
---
drivers/soc/amlogic/Kconfig | 10 +
Expand Down Expand Up @@ -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[] = {
Expand Down

0 comments on commit ad6dede

Please sign in to comment.