diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2015-06-01 10:10:27 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2015-06-01 16:42:31 +0100 |
| commit | 0740135a53f04cce7894e1751b34fe660d948cd1 (patch) | |
| tree | 9f8b216a1c4d8ecff7b39ff5c6637f131cc16900 /sound/soc/codecs/wm5102.c | |
| parent | ASoC: wm5100: Replace direct snd_soc_codec dapm field access (diff) | |
| download | wireguard-linux-0740135a53f04cce7894e1751b34fe660d948cd1.tar.xz wireguard-linux-0740135a53f04cce7894e1751b34fe660d948cd1.zip | |
ASoC: wm5102: Replace direct snd_soc_codec dapm field access
The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to codec->dapm
with snd_soc_codec_get_dapm().
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
| -rw-r--r-- | sound/soc/codecs/wm5102.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 0c6d1bc0526e..f11523fc5bd0 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1827,6 +1827,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = { static int wm5102_codec_probe(struct snd_soc_codec *codec) { + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec); int ret; @@ -1837,9 +1838,9 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) arizona_init_spk(codec); arizona_init_gpio(codec); - snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); + snd_soc_dapm_disable_pin(dapm, "HAPTICS"); - priv->core.arizona->dapm = &codec->dapm; + priv->core.arizona->dapm = dapm; return 0; } |