Skip to contentSkip to conversation

ASoC: dapm: Fix x86_64 build warning.

PATCH Applied Liam Girdwood 4 participants 6 messages Apr 23, 2012 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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]

---
 include/trace/events/asoc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
include/trace/events/asoc.h +2 -2
index 6d8efb1..5fc2dcd 100644
@@ -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",
Signature · 1 line
1.7.5.4
Applied
#1 lore raw
Quoted 1 line · Liam Girdwood

Fixes the following build warning on x86_64.

Applied, thanks.

#2 lore raw
Quoted 4 lines · Mark Brown
Quoted 1 line · Liam Girdwood

Fixes the following build warning on x86_64.

Applied, thanks.

Just wondering, do we have a x86-64 system running asoc?

Signature · 1 line
~Vinod
#3 lore raw
Quoted 7 lines · Vinod Koul
Quoted 4 lines · Mark Brown
Quoted 1 line · Liam Girdwood

Fixes the following build warning on x86_64.

Applied, thanks.

Just wondering, do we have a x86-64 system running asoc?

We should do though we don't currently - see the recent discussion about the ice drivers. There are some PC sound cards (mostly high end or old ones, or tuner cards) which have a setup like ASoC where there's a CODEC on an I2C bus and a "platform" which in this case is a PCI type device. At a high level they look the same as embedded hardware with several chips glued together in software.

#4 lore raw

At Mon, 23 Apr 2012 13:28:44 +0100,

Quoted 8 lines · Mark Brown
Quoted 5 lines · Vinod Koul
Quoted 4 lines · Mark Brown
Quoted 1 line · Liam Girdwood

Fixes the following build warning on x86_64.

Applied, thanks.

Quoted 8 lines
Quoted 1 line

Just wondering, do we have a x86-64 system running asoc?

We should do though we don't currently - see the recent discussion about the ice drivers. There are some PC sound cards (mostly high end or old ones, or tuner cards) which have a setup like ASoC where there's a CODEC on an I2C bus and a "platform" which in this case is a PCI type device. At a high level they look the same as embedded hardware with several chips glued together in software.

Right. In near future, we'd need to move up/down some ASoC code pieces into ALSA core so that people won't misunderstand.

Takashi

#5 lore raw
Quoted 11 lines · Takashi Iwai
Quoted 6 lines · Mark Brown

We should do though we don't currently - see the recent discussion about the ice drivers. There are some PC sound cards (mostly high end or old ones, or tuner cards) which have a setup like ASoC where there's a CODEC on an I2C bus and a "platform" which in this case is a PCI type device. At a high level they look the same as embedded hardware with several chips glued together in software.

Right. In near future, we'd need to move up/down some ASoC code pieces into ALSA core so that people won't misunderstand.

I think from a code structure point of view we're probably mostly fine as is (in that ASoC is sitting in parallel with more integrated sound card architectures) - except for DAPM mostly ASoC is just thin wrappers for the core which split things up for multiple devices. We'd need to deal with that layering somehow if we were merging stuff in.