]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: wm8804: Replace direct snd_soc_codec dapm field access
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 1 Jun 2015 08:10:42 +0000 (10:10 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 1 Jun 2015 15:43:37 +0000 (16:43 +0100)
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>
sound/soc/codecs/wm8804.c

index 1e403f67cf161cfbcf24cd3d934df30765522f16..c195c2e8af074e5fa1b6985b2cf6e85a3df4fd16 100644 (file)
@@ -162,7 +162,7 @@ static int txsrc_put(struct snd_kcontrol *kcontrol,
                     struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol);
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        unsigned int val = ucontrol->value.enumerated.item[0] << e->shift_l;
        unsigned int mask = 1 << e->shift_l;