Skip to content

Commit 7df3eb4

Browse files
lucaceresolibroonie
authored andcommitted
ASoC: trace: add event to snd_soc_dapm trace events
Add the event value to the snd_soc_dapm_start and snd_soc_dapm_done trace events to make them more informative. Trace before: aplay-229 [000] 250.140309: snd_soc_dapm_start: card=vscn-2046 aplay-229 [000] 250.167531: snd_soc_dapm_done: card=vscn-2046 aplay-229 [000] 251.169588: snd_soc_dapm_start: card=vscn-2046 aplay-229 [000] 251.195245: snd_soc_dapm_done: card=vscn-2046 Trace after: aplay-214 [000] 693.290612: snd_soc_dapm_start: card=vscn-2046 event=1 aplay-214 [000] 693.315508: snd_soc_dapm_done: card=vscn-2046 event=1 aplay-214 [000] 694.537349: snd_soc_dapm_start: card=vscn-2046 event=2 aplay-214 [000] 694.563241: snd_soc_dapm_done: card=vscn-2046 event=2 Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Link: https://msgid.link/r/20240306-improve-asoc-trace-events-v1-2-edb252bbeb10@bootlin.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 6ef46a6 commit 7df3eb4

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

include/trace/events/asoc.h

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,34 +57,36 @@ DEFINE_EVENT(snd_soc_dapm, snd_soc_bias_level_done,
5757

5858
DECLARE_EVENT_CLASS(snd_soc_dapm_basic,
5959

60-
TP_PROTO(struct snd_soc_card *card),
60+
TP_PROTO(struct snd_soc_card *card, int event),
6161

62-
TP_ARGS(card),
62+
TP_ARGS(card, event),
6363

6464
TP_STRUCT__entry(
6565
__string( name, card->name )
66+
__field( int, event )
6667
),
6768

6869
TP_fast_assign(
6970
__assign_str(name, card->name);
71+
__entry->event = event;
7072
),
7173

72-
TP_printk("card=%s", __get_str(name))
74+
TP_printk("card=%s event=%d", __get_str(name), (int)__entry->event)
7375
);
7476

7577
DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_start,
7678

77-
TP_PROTO(struct snd_soc_card *card),
79+
TP_PROTO(struct snd_soc_card *card, int event),
7880

79-
TP_ARGS(card)
81+
TP_ARGS(card, event)
8082

8183
);
8284

8385
DEFINE_EVENT(snd_soc_dapm_basic, snd_soc_dapm_done,
8486

85-
TP_PROTO(struct snd_soc_card *card),
87+
TP_PROTO(struct snd_soc_card *card, int event),
8688

87-
TP_ARGS(card)
89+
TP_ARGS(card, event)
8890

8991
);
9092

sound/soc/soc-dapm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,7 +1963,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
19631963

19641964
snd_soc_dapm_mutex_assert_held(card);
19651965

1966-
trace_snd_soc_dapm_start(card);
1966+
trace_snd_soc_dapm_start(card, event);
19671967

19681968
for_each_card_dapms(card, d) {
19691969
if (dapm_idle_bias_off(d))
@@ -2088,7 +2088,7 @@ static int dapm_power_widgets(struct snd_soc_card *card, int event)
20882088
"DAPM sequencing finished, waiting %dms\n", card->pop_time);
20892089
pop_wait(card->pop_time);
20902090

2091-
trace_snd_soc_dapm_done(card);
2091+
trace_snd_soc_dapm_done(card, event);
20922092

20932093
return 0;
20942094
}

0 commit comments

Comments
 (0)