From 410d1297feebbbbea5fe5bd063ef7df575cb420c Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 21 Sep 2011 18:19:14 +0100
Subject: [PATCH] --- yaml --- r: 270647 b: refs/heads/master c:
 e56235e099d7290a2331b984a79f75bbe0865fe8 h: refs/heads/master i:   270645:
 b74e1afbf4c37b312465ca1a90cac45652bffe1f   270643:
 b030b3516ba622c2da24cb26a2bf169a45e166df   270639:
 f14c70d09c6a8677ce0b9c9ddbad9f79a2bb2adb v: v3

---
 [refs]                            | 2 +-
 trunk/include/sound/soc-dapm.h    | 1 +
 trunk/include/trace/events/asoc.h | 7 +++++--
 trunk/sound/soc/soc-dapm.c        | 4 ++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3fd9201662c..2747041500f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7aefb086c15fc44066e705e479d012d46476d8c5
+refs/heads/master: e56235e099d7290a2331b984a79f75bbe0865fe8
diff --git a/trunk/include/sound/soc-dapm.h b/trunk/include/sound/soc-dapm.h
index 0e2d01713cb6..bb5953219d0b 100644
--- a/trunk/include/sound/soc-dapm.h
+++ b/trunk/include/sound/soc-dapm.h
@@ -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
diff --git a/trunk/include/trace/events/asoc.h b/trunk/include/trace/events/asoc.h
index 2e1adf62e0a8..ab26f8aa3c78 100644
--- a/trunk/include/trace/events/asoc.h
+++ b/trunk/include/trace/events/asoc.h
@@ -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,
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
index 84d1d799a0df..6cac04595ccd 100644
--- a/trunk/sound/soc/soc-dapm.c
+++ b/trunk/sound/soc/soc-dapm.c
@@ -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;
 
@@ -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;