Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270647
b: refs/heads/master
c: e56235e
h: refs/heads/master
i:
  270645: b74e1af
  270643: b030b35
  270639: f14c70d
v: v3
  • Loading branch information
Mark Brown committed Sep 22, 2011
1 parent 4a71121 commit 410d129
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7aefb086c15fc44066e705e479d012d46476d8c5
refs/heads/master: e56235e099d7290a2331b984a79f75bbe0865fe8
1 change: 1 addition & 0 deletions trunk/include/sound/soc-dapm.h
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ struct snd_soc_dapm_widget_list {
struct snd_soc_dapm_stats {
int power_checks;
int path_checks;
int neighbour_checks;
};

#endif
7 changes: 5 additions & 2 deletions trunk/include/trace/events/asoc.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,19 @@ TRACE_EVENT(snd_soc_dapm_walk_done,
__string( name, card->name )
__field( int, power_checks )
__field( int, path_checks )
__field( int, neighbour_checks )
),

TP_fast_assign(
__assign_str(name, card->name);
__entry->power_checks = card->dapm_stats.power_checks;
__entry->path_checks = card->dapm_stats.path_checks;
__entry->neighbour_checks = card->dapm_stats.neighbour_checks;
),

TP_printk("%s: %d power checks, %d path checks", __get_str(name),
(int)__entry->power_checks, (int)__entry->path_checks)
TP_printk("%s: checks %d power, %d path, %d neighbour",
__get_str(name), (int)__entry->power_checks,
(int)__entry->path_checks, (int)__entry->neighbour_checks)
);

TRACE_EVENT(snd_soc_jack_irq,
Expand Down
4 changes: 4 additions & 0 deletions trunk/sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,8 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget)
}

list_for_each_entry(path, &widget->sinks, list_source) {
DAPM_UPDATE_STAT(widget, neighbour_checks);

if (path->weak)
continue;

Expand Down Expand Up @@ -732,6 +734,8 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget)
}

list_for_each_entry(path, &widget->sources, list_sink) {
DAPM_UPDATE_STAT(widget, neighbour_checks);

if (path->weak)
continue;

Expand Down

0 comments on commit 410d129

Please sign in to comment.