ASoC: Move pop time from DAPM context to sound card

Based on discussion the dapm_pop_time in debugsfs should be per card rather
than per device. Single pop time value for entire card is cleaner when the
DAPM sequencing is extended to cross-device paths.

debugfs/asoc/{card->name}/{codec dir}/dapm_pop_time
->
debugfs/asoc/{card->name}/dapm_pop_time

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 5881876e8f5b..78d3560fa25a 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -469,7 +469,6 @@ struct snd_soc_dapm_widget {
 
 /* DAPM context */
 struct snd_soc_dapm_context {
-        u32 pop_time;
         struct list_head widgets;
         struct list_head paths;
         enum snd_soc_bias_level bias_level;
@@ -479,6 +478,7 @@ struct snd_soc_dapm_context {
 
         struct device *dev; /* from parent - for debug */
         struct snd_soc_codec *codec; /* parent codec */
+        struct snd_soc_card *card; /* parent card */
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_dapm;
 #endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 95ce0ddd36d4..5d3954774ade 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -457,7 +457,6 @@ struct snd_soc_codec {
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_codec_root;
         struct dentry *debugfs_reg;
-        struct dentry *debugfs_pop_time;
         struct dentry *debugfs_dapm;
 #endif
 };
@@ -592,7 +591,9 @@ struct snd_soc_card {
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_card_root;
+        struct dentry *debugfs_pop_time;
 #endif
+        u32 pop_time;
 };
 
 /* SoC machine DAI configuration, glues a codec and cpu DAI together */