From: p.zabel@pengutronix.de (Philipp Zabel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] [media] coda: remove extraneous TRACE_SYSTEM_STRING
Date: Wed, 20 May 2015 11:42:39 +0200 [thread overview]
Message-ID: <1432114959.4466.10.camel@pengutronix.de> (raw)
In-Reply-To: <4790110.OLqddgPxAn@wuerfel>
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 <arnd@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.zabel@pengutronix.de>
thanks
Philipp
prev parent reply other threads:[~2015-05-20 9:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-19 21:34 [PATCH] [media] coda: remove extraneous TRACE_SYSTEM_STRING Arnd Bergmann
2015-05-20 9:42 ` Philipp Zabel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1432114959.4466.10.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).