path: root/include/sound
diff options
authorJarkko Nikula <jhnikula@gmail.com>2010-12-14 12:18:30 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-15 18:00:41 +0000
commit8ddab3f5107c3955e70e87a632d4d179ddba1189 (patch)
tree639742e20df719e585f1f31896112fa08314f7a6 /include/sound
parentASoC: Remove unused DAPM_DOUBLE control types (diff)
ASoC: Move DAPM paths from DAPM context to snd_soc_card
Decoupling DAPM paths from DAPM context is a first prerequisite when extending ASoC core to cross-device paths. This patch is almost a nullop and does not allow to construct cross-device setup but the path clean-up part in dapm_free_widgets is prepared to remove cross-device paths between a device being removed and others. Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound')
2 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index aef975f47bad..2c1e0eed43d5 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -463,7 +463,6 @@ struct snd_soc_dapm_widget {
/* DAPM context */
struct snd_soc_dapm_context {
struct list_head widgets;
- struct list_head paths;
enum snd_soc_bias_level bias_level;
enum snd_soc_bias_level suspend_bias_level;
struct delayed_work delayed_work;
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 7e65b015f8dd..466895b627b5 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -661,6 +661,8 @@ struct snd_soc_card {
struct list_head platform_dev_list;
struct list_head dai_dev_list;
+ struct list_head paths;
struct dentry *debugfs_card_root;
struct dentry *debugfs_pop_time;