summaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2012-04-23 10:31:15 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-23 13:15:35 +0100
commitc97f3bdd26080c2cb2a648c37b6dcb8eac2f91e7 (patch)
treeb35a0e006486995ce7d18028f9bdbd3f1d803c66 /include/trace
parentfde39a6b15612943673555aec7237f9e7228f27d (diff)
downloadlinux-stable-c97f3bdd26080c2cb2a648c37b6dcb8eac2f91e7.tar.gz
linux-stable-c97f3bdd26080c2cb2a648c37b6dcb8eac2f91e7.tar.bz2
linux-stable-c97f3bdd26080c2cb2a648c37b6dcb8eac2f91e7.zip
ASoC: dapm: Fix x86_64 build warning.
Fixes the following build warning on x86_64. In file included from include/trace/ftrace.h:567:0, from include/trace/define_trace.h:86, from include/trace/events/asoc.h:410, from sound/soc/soc-core.c:45: include/trace/events/asoc.h: In function 'ftrace_raw_event_snd_soc_dapm_output_path': include/trace/events/asoc.h:246:1: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] include/trace/events/asoc.h: In function 'ftrace_raw_event_snd_soc_dapm_input_path': include/trace/events/asoc.h:275:1: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Signed-off-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/asoc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index 6d8efb1cc8ce..5fc2dcdd21cd 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -263,7 +263,7 @@ TRACE_EVENT(snd_soc_dapm_output_path,
__assign_str(pname, path->name ? path->name : DAPM_DIRECT);
__assign_str(psname, path->sink->name);
__entry->path_connect = path->connect;
- __entry->path_sink = (int)path->sink;
+ __entry->path_sink = (long)path->sink;
),
TP_printk("%c%s -> %s -> %s\n",
@@ -292,7 +292,7 @@ TRACE_EVENT(snd_soc_dapm_input_path,
__assign_str(pname, path->name ? path->name : DAPM_DIRECT);
__assign_str(psname, path->source->name);
__entry->path_connect = path->connect;
- __entry->path_source = (int)path->source;
+ __entry->path_source = (long)path->source;
),
TP_printk("%c%s <- %s <- %s\n",