Re: [PATCH] [media] coda: remove extraneous TRACE_SYSTEM_STRING

2015-05-20 Thread Philipp Zabel
Am Dienstag, den 19.05.2015, 23:34 +0200 schrieb Arnd Bergmann:
 The coda tracing code causes lots of warnings like
 
 In file included from /git/arm-soc/include/trace/define_trace.h:90:0,
  from /git/arm-soc/drivers/media/platform/coda/trace.h:203,
  from /git/arm-soc/drivers/media/platform/coda/coda-bit.c:34:
 /git/arm-soc/include/trace/ftrace.h:28:0: warning: TRACE_SYSTEM_STRING 
 redefined
  #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
  ^
 In file included from /git/arm-soc/include/trace/define_trace.h:83:0,
  from /git/arm-soc/drivers/media/platform/coda/trace.h:203,
  from /git/arm-soc/drivers/media/platform/coda/coda-bit.c:34:
 /git/arm-soc/drivers/media/platform/coda/./trace.h:12:0: note: this is the 
 location of the previous definition
  #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
 
 From what I can tell, this is just the result of a bogus TRACE_SYSTEM_STRING
 definition, and removing that one makes the warnings go away.
 
 Signed-off-by: Arnd Bergmann a...@arndb.de
 Fixes: 9a1a8f9953f ([media] coda: Add tracing support)
 
 diff --git a/drivers/media/platform/coda/trace.h 
 b/drivers/media/platform/coda/trace.h
 index d1d06cbd1f6a..781bf7286d53 100644
 --- a/drivers/media/platform/coda/trace.h
 +++ b/drivers/media/platform/coda/trace.h
 @@ -9,8 +9,6 @@
  
  #include coda.h
  
 -#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
 -
  TRACE_EVENT(coda_bit_run,
   TP_PROTO(struct coda_ctx *ctx, int cmd),

Steven sent the same fix to linux-next recently ([PATCH][linux-next]
coda: Do not define TRACE_SYSTEM_STRING). As he points out, this is the
result of a bogus copy  paste. Kamil, would you queue either of them
with my
Acked-by: Philipp Zabel p.za...@pengutronix.de

thanks
Philipp

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] [media] coda: remove extraneous TRACE_SYSTEM_STRING

2015-05-19 Thread Arnd Bergmann
The coda tracing code causes lots of warnings like

In file included from /git/arm-soc/include/trace/define_trace.h:90:0,
 from /git/arm-soc/drivers/media/platform/coda/trace.h:203,
 from /git/arm-soc/drivers/media/platform/coda/coda-bit.c:34:
/git/arm-soc/include/trace/ftrace.h:28:0: warning: TRACE_SYSTEM_STRING 
redefined
 #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
 ^
In file included from /git/arm-soc/include/trace/define_trace.h:83:0,
 from /git/arm-soc/drivers/media/platform/coda/trace.h:203,
 from /git/arm-soc/drivers/media/platform/coda/coda-bit.c:34:
/git/arm-soc/drivers/media/platform/coda/./trace.h:12:0: note: this is the 
location of the previous definition
 #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)

From what I can tell, this is just the result of a bogus TRACE_SYSTEM_STRING
definition, and removing that one makes the warnings go away.

Signed-off-by: Arnd Bergmann a...@arndb.de
Fixes: 9a1a8f9953f ([media] coda: Add tracing support)

diff --git a/drivers/media/platform/coda/trace.h 
b/drivers/media/platform/coda/trace.h
index d1d06cbd1f6a..781bf7286d53 100644
--- a/drivers/media/platform/coda/trace.h
+++ b/drivers/media/platform/coda/trace.h
@@ -9,8 +9,6 @@
 
 #include coda.h
 
-#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
-
 TRACE_EVENT(coda_bit_run,
TP_PROTO(struct coda_ctx *ctx, int cmd),
 

--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html