diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:52 +0100 |
| commit | 97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9 (patch) | |
| tree | abad2cc74e89d65514b501ad39fdf7a1c3546106 /include | |
| parent | 5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36 (diff) | |
| parent | e03f73a01f010b29504ceebda3c4fca25468516d (diff) | |
| download | linux-97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9.tar.gz linux-97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9.tar.bz2 linux-97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 6 | ||||
| -rw-r--r-- | include/trace/events/asoc.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index f1366ebca9c5..f90f605b3971 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -912,7 +912,7 @@ struct snd_soc_dai_link { * only for codec to codec links, or systems using device tree. */ const char *cpu_name; - const struct device_node *cpu_of_node; + struct device_node *cpu_of_node; /* * You MAY specify the DAI name of the CPU DAI. If this information is * omitted, the CPU-side DAI is matched using .cpu_name/.cpu_of_node @@ -924,7 +924,7 @@ struct snd_soc_dai_link { * DT/OF node, but not both. */ const char *codec_name; - const struct device_node *codec_of_node; + struct device_node *codec_of_node; /* You MUST specify the DAI name within the codec */ const char *codec_dai_name; @@ -937,7 +937,7 @@ struct snd_soc_dai_link { * do not need a platform. */ const char *platform_name; - const struct device_node *platform_of_node; + struct device_node *platform_of_node; int be_id; /* optional ID for machine driver BE identification */ const struct snd_soc_pcm_stream *params; diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index 0194a641e4e2..b04ee7e5a466 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h @@ -175,7 +175,7 @@ TRACE_EVENT(snd_soc_dapm_output_path, __entry->path_sink = (long)path->sink; ), - TP_printk("%c%s -> %s -> %s\n", + TP_printk("%c%s -> %s -> %s", (int) __entry->path_sink && (int) __entry->path_connect ? '*' : ' ', __get_str(wname), __get_str(pname), __get_str(psname)) @@ -204,7 +204,7 @@ TRACE_EVENT(snd_soc_dapm_input_path, __entry->path_source = (long)path->source; ), - TP_printk("%c%s <- %s <- %s\n", + TP_printk("%c%s <- %s <- %s", (int) __entry->path_source && (int) __entry->path_connect ? '*' : ' ', __get_str(wname), __get_str(pname), __get_str(psname)) @@ -226,7 +226,7 @@ TRACE_EVENT(snd_soc_dapm_connected, __entry->stream = stream; ), - TP_printk("%s: found %d paths\n", + TP_printk("%s: found %d paths", __entry->stream ? "capture" : "playback", __entry->paths) ); |