aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/samsung/smdk_wm8994.c
diff options
context:
space:
mode:
authorGravatar Lars-Peter Clausen <lars@metafoo.de> 2015-05-03 19:27:07 +0200
committerGravatar Mark Brown <broonie@kernel.org> 2015-05-04 13:51:19 +0100
commite6963005b2a36a11dbc059006ba52a10e2fecfbe (patch)
tree10eff5a5c765016ef48ce5512ef2fee03b48ea43 /sound/soc/samsung/smdk_wm8994.c
parentASoC: lowland: Use card DAPM context to access widgets (diff)
downloadlinux-e6963005b2a36a11dbc059006ba52a10e2fecfbe.tar.gz
linux-e6963005b2a36a11dbc059006ba52a10e2fecfbe.tar.bz2
linux-e6963005b2a36a11dbc059006ba52a10e2fecfbe.zip
ASoC: smdk_wm8994: Use card DAPM context to access widgets
The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung/smdk_wm8994.c')
-rw-r--r--sound/soc/samsung/smdk_wm8994.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index d38595fbdab7..ff57b192d37d 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -86,8 +86,7 @@ static struct snd_soc_ops smdk_ops = {
static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd)
{
- struct snd_soc_codec *codec = rtd->codec;
- struct snd_soc_dapm_context *dapm = &codec->dapm;
+ struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
/* Other pins NC */
snd_soc_dapm_nc_pin(dapm, "HPOUT2P");