aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-11-05 14:35:21 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-06 11:28:35 -0400
commit3a45b8672d3f8542e430e7a5c7366ec9bdded054 (patch)
treee15feaaddb1f81727c0e9c0af3a9b5d642b96684 /include/sound/soc.h
parentd6ce4cf3967dca78f967cd0bf70b175084885f40 (diff)
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>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h3
1 files changed, 2 insertions, 1 deletions
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 {
457#ifdef CONFIG_DEBUG_FS 457#ifdef CONFIG_DEBUG_FS
458 struct dentry *debugfs_codec_root; 458 struct dentry *debugfs_codec_root;
459 struct dentry *debugfs_reg; 459 struct dentry *debugfs_reg;
460 struct dentry *debugfs_pop_time;
461 struct dentry *debugfs_dapm; 460 struct dentry *debugfs_dapm;
462#endif 461#endif
463}; 462};
@@ -592,7 +591,9 @@ struct snd_soc_card {
592 591
593#ifdef CONFIG_DEBUG_FS 592#ifdef CONFIG_DEBUG_FS
594 struct dentry *debugfs_card_root; 593 struct dentry *debugfs_card_root;
594 struct dentry *debugfs_pop_time;
595#endif 595#endif
596 u32 pop_time;
596}; 597};
597 598
598/* SoC machine DAI configuration, glues a codec and cpu DAI together */ 599/* SoC machine DAI configuration, glues a codec and cpu DAI together */