History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits) ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl ALSA: aloop - Fix possible IRQ lock inversion ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail() ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination ALSA: firewire - msleep needs delay.h ALSA: firewire-lib, firewire-speakers: handle packet queueing errors ALSA: firewire-lib: allocate DMA buffer separately ALSA: firewire-lib: use no-info SYT for packets without SYT sample ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver ALSA: hda - Remove an unused variable in patch_realtek.c ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs ALSA: hda - Move default input-src selection to init part ALSA: hda - Initialize special cases for input src in init phase ALSA: ctxfi - Clear input settings before initialization ALSA: ctxfi - Fix SPDIF status retrieval ALSA: ctxfi - Fix incorrect SPDIF status bit mask ALSA: ctxfi - Fix microphone boost codes/comments ALSA: atiixp - Fix wrong time-out checks during ac-link reset ALSA: intel8x0m: append 'm' to "r_intel8x0" ...

Linus Torvalds committed 15 years ago

Commit d3e458d2 parents f2e1fbb d351cf4254 files · +27080 −9623Browse files

Showing the changes to include/trace (1 of 254 files). Show all

Unified · Split

include/trace/events/asoc.h+25−0
@@ -229,6 +229,31 @@ TRACE_EVENT(snd_soc_jack_notify, · 228 unmodified lines
229229 TP_printk("jack=%s %x", __get_str(name), (int)__entry->val)
230230 );
231231
232+TRACE_EVENT(snd_soc_cache_sync,
233+
234+ TP_PROTO(struct snd_soc_codec *codec, const char *type,
235+ const char *status),
236+
237+ TP_ARGS(codec, type, status),
238+
239+ TP_STRUCT__entry(
240+ __string( name, codec->name )
241+ __string( status, status )
242+ __string( type, type )
243+ __field( int, id )
244+ ),
245+
246+ TP_fast_assign(
247+ __assign_str(name, codec->name);
248+ __assign_str(status, status);
249+ __assign_str(type, type);
250+ __entry->id = codec->id;
251+ ),
252+
253+ TP_printk("codec=%s.%d type=%s status=%s", __get_str(name),
254+ (int)__entry->id, __get_str(type), __get_str(status))
255+);
256+
232257 #endif /* _TRACE_ASOC_H */
233258
234259 /* This part must be outside protection */