diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:25:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 17:25:01 -0400 |
commit | 68d99b2c8efcb6ed3807a55569300c53b5f88be5 (patch) | |
tree | f189c8f2132d3668a2f0e503f5c3f8695b26a1c8 /include/trace | |
parent | 0e59e7e7feb5a12938fbf9135147eeda3238c6c4 (diff) | |
parent | 8128c9f21509f9a8b6da94ac432d845dda458406 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
ALSA: hda - Keep EAPD turned on for old Conexant chips
ALSA: hda/realtek - Fix missing volume controls with ALC260
ASoC: wm8940: Properly set codec->dapm.bias_level
ALSA: hda - Fix pin-config for ASUS W90V
ALSA: hda - Fix surround/CLFE headphone and speaker pins order
ALSA: hda - Fix typo
ALSA: Update the sound git tree URL
ALSA: HDA: Add new revision for ALC662
ASoC: max98095: Convert codec->hw_write to snd_soc_write
ASoC: keep pointer to resource so it can be freed
ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
ASoC: da7210: Add support for line out and DAC
ASoC: da7210: Add support for DAPM
ALSA: hda/realtek - Fix DAC assignments of multiple speakers
ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
ASoC: Set sgtl5000->ldo in ldo_regulator_register
ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
...
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/asoc.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index 603f5a0f036..ab26f8aa3c7 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h | |||
@@ -216,6 +216,31 @@ DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done, | |||
216 | 216 | ||
217 | ); | 217 | ); |
218 | 218 | ||
219 | TRACE_EVENT(snd_soc_dapm_walk_done, | ||
220 | |||
221 | TP_PROTO(struct snd_soc_card *card), | ||
222 | |||
223 | TP_ARGS(card), | ||
224 | |||
225 | TP_STRUCT__entry( | ||
226 | __string( name, card->name ) | ||
227 | __field( int, power_checks ) | ||
228 | __field( int, path_checks ) | ||
229 | __field( int, neighbour_checks ) | ||
230 | ), | ||
231 | |||
232 | TP_fast_assign( | ||
233 | __assign_str(name, card->name); | ||
234 | __entry->power_checks = card->dapm_stats.power_checks; | ||
235 | __entry->path_checks = card->dapm_stats.path_checks; | ||
236 | __entry->neighbour_checks = card->dapm_stats.neighbour_checks; | ||
237 | ), | ||
238 | |||
239 | TP_printk("%s: checks %d power, %d path, %d neighbour", | ||
240 | __get_str(name), (int)__entry->power_checks, | ||
241 | (int)__entry->path_checks, (int)__entry->neighbour_checks) | ||
242 | ); | ||
243 | |||
219 | TRACE_EVENT(snd_soc_jack_irq, | 244 | TRACE_EVENT(snd_soc_jack_irq, |
220 | 245 | ||
221 | TP_PROTO(const char *name), | 246 | TP_PROTO(const char *name), |