OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Trace: Rename UNUSED() macro to SOF_TRACE_UNUSED() 

The xt-clang RI-2022.10 compiler headers define UNUSED. The
rename of the macro for trace fixes in testbench build this
error:

  In file included sof/tools/tplg_parser/pga.c:17:
  In file included sof/tools/tplg_parser/
  ../../src/include/sof/lib/uuid.h:11:
  In file included sof/tools/tplg_parser/
  ../../src/include/sof/common.h:105:
  /home/singalsu/work/current/sof/sof/tools/tplg_parser/
  ../../src/include/sof/trace/preproc.h:162:9: error:
  'UNUSED' macro redefined [-Werror,-Wmacro-redefined]
  #define UNUSED(arg1, ...) do { META_RECURSE(
  xtensa/XtDevTools/install/tools/RI-2022.10-linux/XtensaTools/
  xtensa-elf/include/xtensa/xtensa-types.h:60:9:
  note: previous definition is here
  #define UNUSED(x)       ((void)(x))

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This commit is contained in:
Seppo Ingalsuo 2023-10-25 16:49:41 +03:00 committed by Kai Vehmanen
parent 1c729f43c8
commit 369dac1a22
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/sof/trace/preproc.h
View File

@ -158,7 +158,7 @@
return_t META_CONCAT(prefix, postfix) (args)
/* counteract compiler warning about unused variables */
#define UNUSED(arg1, ...) do { META_RECURSE( \
#define SOF_TRACE_UNUSED(arg1, ...) do { META_RECURSE( \
META_MAP_AGGREGATE(1, _META_VOID2, _META_VOID(arg1), __VA_ARGS__)); \
} while (0)

2
src/include/sof/trace/trace.h
View File

@ -93,7 +93,7 @@ static inline struct trace *trace_get(void)
/* Silences compiler warnings about unused variables */
#define trace_unused(class, ctx, id_1, id_2, format, ...) \
UNUSED(ctx, id_1, id_2, ##__VA_ARGS__)
SOF_TRACE_UNUSED(ctx, id_1, id_2, ##__VA_ARGS__)
struct trace_filter {
uint32_t uuid_id; /**< type id, or 0 when not important */