[PATCH] ramips: fix ralink_i2s_debugfs_remove declaration

Eneas U de Queiroz cotequeiroz at gmail.com
Mon Sep 20 13:31:48 PDT 2021


Correct ralink_i2s_debugfs_remove declaration in ralink patches when
CONFIG_DEBUG_FS is not selected.

Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
---

Fixes the following error, when compiling without DEBUG_FS:

sound/soc/ralink/ralink-i2s.c:678:53: warning: 'struct fsl_ssi_dbg' declared inside parameter list will not be visible outside of this definition or declaration
 static inline void ralink_i2s_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)
                                                     ^~~~~~~~~~~
sound/soc/ralink/ralink-i2s.c: In function 'ralink_i2s_probe':
sound/soc/ralink/ralink-i2s.c:935:28: error: passing argument 1 of 'ralink_i2s_debugfs_remove' from incompatible pointer type [-Werror=incompatible-pointer-types]
  ralink_i2s_debugfs_remove(i2s);
                            ^~~
sound/soc/ralink/ralink-i2s.c:678:66: note: expected 'struct fsl_ssi_dbg *' but argument is of type 'struct ralink_i2s *'
 static inline void ralink_i2s_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)
                                              ~~~~~~~~~~~~~~~~~~~~^~~~~~~
sound/soc/ralink/ralink-i2s.c: In function 'ralink_i2s_remove':
sound/soc/ralink/ralink-i2s.c:947:28: error: passing argument 1 of 'ralink_i2s_debugfs_remove' from incompatible pointer type [-Werror=incompatible-pointer-types]
  ralink_i2s_debugfs_remove(i2s);
                            ^~~
sound/soc/ralink/ralink-i2s.c:678:66: note: expected 'struct fsl_ssi_dbg *' but argument is of type 'struct ralink_i2s *'
 static inline void ralink_i2s_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)
                                              ~~~~~~~~~~~~~~~~~~~~^~~~~~~
At top level:
sound/soc/ralink/ralink-i2s.c:146:13: warning: 'ralink_i2s_dump_regs' defined but not used [-Wunused-function]
 static void ralink_i2s_dump_regs(struct ralink_i2s *i2s)
             ^~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
make[7]: *** [scripts/Makefile.build:280: sound/soc/ralink/ralink-i2s.o] Error 1
make[6]: *** [scripts/Makefile.build:497: sound/soc/ralink] Error 2
make[5]: *** [scripts/Makefile.build:497: sound/soc] Error 2
make[4]: *** [Makefile:1822: sound] Error 2

 .../linux/ramips/patches-5.10/835-asoc-add-mt7620-support.patch | 2 +-
 .../linux/ramips/patches-5.4/0048-asoc-add-mt7620-support.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

----

diff --git a/target/linux/ramips/patches-5.10/835-asoc-add-mt7620-support.patch b/target/linux/ramips/patches-5.10/835-asoc-add-mt7620-support.patch
index 255c8d751a..680b678168 100644
--- a/target/linux/ramips/patches-5.10/835-asoc-add-mt7620-support.patch
+++ b/target/linux/ramips/patches-5.10/835-asoc-add-mt7620-support.patch
@@ -738,7 +738,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	return 0;
 +}
 +
-+static inline void ralink_i2s_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)
++static inline void ralink_i2s_debugfs_remove(struct ralink_i2s *i2s)
 +{
 +}
 +#endif
diff --git a/target/linux/ramips/patches-5.4/0048-asoc-add-mt7620-support.patch b/target/linux/ramips/patches-5.4/0048-asoc-add-mt7620-support.patch
index cffdc4f4a1..4b9c877a7f 100644
--- a/target/linux/ramips/patches-5.4/0048-asoc-add-mt7620-support.patch
+++ b/target/linux/ramips/patches-5.4/0048-asoc-add-mt7620-support.patch
@@ -738,7 +738,7 @@ Signed-off-by: John Crispin <blogic at openwrt.org>
 +	return 0;
 +}
 +
-+static inline void ralink_i2s_debugfs_remove(struct fsl_ssi_dbg *ssi_dbg)
++static inline void ralink_i2s_debugfs_remove(struct ralink_i2s *i2s)
 +{
 +}
 +#endif



More information about the openwrt-devel mailing list