diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-05-03 19:27:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-04 14:51:19 +0200 |
| commit | d01d7d3dba3dc1e5fbf291f98dba6e8ff221f9f2 (patch) | |
| tree | 9f502c5433895676a9d067cf4541056aeaea91ce | |
| parent | ASoC: smartq: Remove unnecessary snd_soc_dapm_disable_pin() (diff) | |
| download | linux-d01d7d3dba3dc1e5fbf291f98dba6e8ff221f9f2.tar.xz linux-d01d7d3dba3dc1e5fbf291f98dba6e8ff221f9f2.zip | |
ASoC: smartq: 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>
| -rw-r--r-- | sound/soc/samsung/smartq_wm8987.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index c75f98d4931d..a0fe37fbed9f 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c @@ -137,8 +137,7 @@ static const struct snd_soc_dapm_route audio_map[] = { static int smartq_wm8987_init(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; int err = 0; /* set endpoints to not connected */ |