]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ASoC: twl6040: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 15 Jan 2015 11:52:07 +0000 (12:52 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 15 Jan 2015 11:57:06 +0000 (11:57 +0000)
The codec field of the snd_soc_widget struct is eventually going to be
removed, use snd_soc_dapm_to_codec(w->dapm) instead.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/twl6040.c

index 90f47f988b3fe3b1e28321df538c1ba2f7d9bb4f..aeec27b6f1af76aca729aacd35e872b01eb05362 100644 (file)
@@ -234,7 +234,7 @@ static int headset_power_mode(struct snd_soc_codec *codec, int high_perf)
 static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w,
                        struct snd_kcontrol *kcontrol, int event)
 {
-       struct snd_soc_codec *codec = w->codec;
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        u8 hslctl, hsrctl;
 
        /*
@@ -261,7 +261,7 @@ static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w,
 static int twl6040_ep_drv_event(struct snd_soc_dapm_widget *w,
                        struct snd_kcontrol *kcontrol, int event)
 {
-       struct snd_soc_codec *codec = w->codec;
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
        int ret = 0;