aboutsummaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-06-16 18:13:07 +0200
committerMark Brown <broonie@linaro.org>2014-06-21 21:34:15 +0100
commitbc9af9fa9b89cb74eed020066d882abf238fad69 (patch)
treef3462c4aedb204a7a8789f3da35d7d63190b6111 /include/sound
parentce0fc93ae56e2ba50ff8c220d69e4e860e889320 (diff)
downloadlinux-linaro-stable-bc9af9fa9b89cb74eed020066d882abf238fad69.tar.gz
ASoC: Use component DAPM context for platforms
The snd_soc_platform dapm field is not accessed outside of the ASoC core. Switch it over to using the snd_soc_component DAPM context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index a21dfecba56b..84ebc079c92f 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -862,8 +862,6 @@ struct snd_soc_platform {
struct snd_soc_component component;
- struct snd_soc_dapm_context dapm;
-
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_platform_root;
#endif
@@ -1203,7 +1201,7 @@ static inline struct snd_soc_codec *snd_soc_dapm_to_codec(
static inline struct snd_soc_platform *snd_soc_dapm_to_platform(
struct snd_soc_dapm_context *dapm)
{
- return container_of(dapm, struct snd_soc_platform, dapm);
+ return snd_soc_component_to_platform(snd_soc_dapm_to_component(dapm));
}
/**