diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:19 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 02:43:19 -0400 |
| commit | 13b137ef0367237909bb2dc38babfb8305154676 (patch) | |
| tree | a5d756fcc6603da970ef8c5e263244c6166a2fba /include/trace | |
| parent | e8fd86efaa09445ca1afc1aea08d4666c966ed03 (diff) | |
| parent | 440085598672c0e3fde8a48495f61fea418b06d1 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/asoc.h | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index ae973d2e27a1..603f5a0f0365 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | struct snd_soc_jack; | 10 | struct snd_soc_jack; |
| 11 | struct snd_soc_codec; | 11 | struct snd_soc_codec; |
| 12 | struct snd_soc_platform; | ||
| 12 | struct snd_soc_card; | 13 | struct snd_soc_card; |
| 13 | struct snd_soc_dapm_widget; | 14 | struct snd_soc_dapm_widget; |
| 14 | 15 | ||
| @@ -59,6 +60,50 @@ DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read, | |||
| 59 | 60 | ||
| 60 | ); | 61 | ); |
| 61 | 62 | ||
| 63 | DECLARE_EVENT_CLASS(snd_soc_preg, | ||
| 64 | |||
| 65 | TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, | ||
| 66 | unsigned int val), | ||
| 67 | |||
| 68 | TP_ARGS(platform, reg, val), | ||
| 69 | |||
| 70 | TP_STRUCT__entry( | ||
| 71 | __string( name, platform->name ) | ||
| 72 | __field( int, id ) | ||
| 73 | __field( unsigned int, reg ) | ||
| 74 | __field( unsigned int, val ) | ||
| 75 | ), | ||
| 76 | |||
| 77 | TP_fast_assign( | ||
| 78 | __assign_str(name, platform->name); | ||
| 79 | __entry->id = platform->id; | ||
| 80 | __entry->reg = reg; | ||
| 81 | __entry->val = val; | ||
| 82 | ), | ||
| 83 | |||
| 84 | TP_printk("platform=%s.%d reg=%x val=%x", __get_str(name), | ||
| 85 | (int)__entry->id, (unsigned int)__entry->reg, | ||
| 86 | (unsigned int)__entry->val) | ||
| 87 | ); | ||
| 88 | |||
| 89 | DEFINE_EVENT(snd_soc_preg, snd_soc_preg_write, | ||
| 90 | |||
| 91 | TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, | ||
| 92 | unsigned int val), | ||
| 93 | |||
| 94 | TP_ARGS(platform, reg, val) | ||
| 95 | |||
| 96 | ); | ||
| 97 | |||
| 98 | DEFINE_EVENT(snd_soc_preg, snd_soc_preg_read, | ||
| 99 | |||
| 100 | TP_PROTO(struct snd_soc_platform *platform, unsigned int reg, | ||
| 101 | unsigned int val), | ||
| 102 | |||
| 103 | TP_ARGS(platform, reg, val) | ||
| 104 | |||
| 105 | ); | ||
| 106 | |||
| 62 | DECLARE_EVENT_CLASS(snd_soc_card, | 107 | DECLARE_EVENT_CLASS(snd_soc_card, |
| 63 | 108 | ||
| 64 | TP_PROTO(struct snd_soc_card *card, int val), | 109 | TP_PROTO(struct snd_soc_card *card, int val), |