diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-06 07:48:52 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-06 07:48:52 -0400 |
commit | 97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9 (patch) | |
tree | abad2cc74e89d65514b501ad39fdf7a1c3546106 /include/trace | |
parent | 5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36 (diff) | |
parent | e03f73a01f010b29504ceebda3c4fca25468516d (diff) |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/asoc.h | 6 |
1 files changed, 3 insertions, 3 deletions
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, | |||
175 | __entry->path_sink = (long)path->sink; | 175 | __entry->path_sink = (long)path->sink; |
176 | ), | 176 | ), |
177 | 177 | ||
178 | TP_printk("%c%s -> %s -> %s\n", | 178 | TP_printk("%c%s -> %s -> %s", |
179 | (int) __entry->path_sink && | 179 | (int) __entry->path_sink && |
180 | (int) __entry->path_connect ? '*' : ' ', | 180 | (int) __entry->path_connect ? '*' : ' ', |
181 | __get_str(wname), __get_str(pname), __get_str(psname)) | 181 | __get_str(wname), __get_str(pname), __get_str(psname)) |
@@ -204,7 +204,7 @@ TRACE_EVENT(snd_soc_dapm_input_path, | |||
204 | __entry->path_source = (long)path->source; | 204 | __entry->path_source = (long)path->source; |
205 | ), | 205 | ), |
206 | 206 | ||
207 | TP_printk("%c%s <- %s <- %s\n", | 207 | TP_printk("%c%s <- %s <- %s", |
208 | (int) __entry->path_source && | 208 | (int) __entry->path_source && |
209 | (int) __entry->path_connect ? '*' : ' ', | 209 | (int) __entry->path_connect ? '*' : ' ', |
210 | __get_str(wname), __get_str(pname), __get_str(psname)) | 210 | __get_str(wname), __get_str(pname), __get_str(psname)) |
@@ -226,7 +226,7 @@ TRACE_EVENT(snd_soc_dapm_connected, | |||
226 | __entry->stream = stream; | 226 | __entry->stream = stream; |
227 | ), | 227 | ), |
228 | 228 | ||
229 | TP_printk("%s: found %d paths\n", | 229 | TP_printk("%s: found %d paths", |
230 | __entry->stream ? "capture" : "playback", __entry->paths) | 230 | __entry->stream ? "capture" : "playback", __entry->paths) |
231 | ); | 231 | ); |
232 | 232 | ||