These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / codecs / adau17x1.c

diff --git a/kernel/sound/soc/codecs/adau17x1.c b/kernel/sound/soc/codecs/adau17x1.c
index fa2e690..fcf05b2 100644 (file)
--- a/kernel/sound/soc/codecs/adau17x1.c
+++ b/kernel/sound/soc/codecs/adau17x1.c
@@ -155,6 +155,7 @@ static int adau17x1_dsp_mux_enum_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 = snd_soc_codec_get_dapm(codec);
        struct adau *adau = snd_soc_codec_get_drvdata(codec);
        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        struct snd_soc_dapm_update update;
@@ -188,7 +189,7 @@ static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol,
                update.reg = reg;
                update.val = val;
 
-               snd_soc_dapm_mux_update_power(&codec->dapm, kcontrol,
+               snd_soc_dapm_mux_update_power(dapm, kcontrol,
                                ucontrol->value.enumerated.item[0], e, &update);
        }
 
@@ -444,8 +445,8 @@ static int adau17x1_set_dai_pll(struct snd_soc_dai *dai, int pll_id,
 static int adau17x1_set_dai_sysclk(struct snd_soc_dai *dai,
                int clk_id, unsigned int freq, int dir)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(dai->codec);
        struct adau *adau = snd_soc_codec_get_drvdata(dai->codec);
-       struct snd_soc_dapm_context *dapm = &dai->codec->dapm;
 
        switch (clk_id) {
        case ADAU17X1_CLK_SRC_MCLK:
@@ -804,6 +805,7 @@ EXPORT_SYMBOL_GPL(adau17x1_setup_firmware);
 
 int adau17x1_add_widgets(struct snd_soc_codec *codec)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct adau *adau = snd_soc_codec_get_drvdata(codec);
        int ret;
 
@@ -811,14 +813,13 @@ int adau17x1_add_widgets(struct snd_soc_codec *codec)
                ARRAY_SIZE(adau17x1_controls));
        if (ret)
                return ret;
-       ret = snd_soc_dapm_new_controls(&codec->dapm, adau17x1_dapm_widgets,
+       ret = snd_soc_dapm_new_controls(dapm, adau17x1_dapm_widgets,
                ARRAY_SIZE(adau17x1_dapm_widgets));
        if (ret)
                return ret;
 
        if (adau17x1_has_dsp(adau)) {
-               ret = snd_soc_dapm_new_controls(&codec->dapm,
-                       adau17x1_dsp_dapm_widgets,
+               ret = snd_soc_dapm_new_controls(dapm, adau17x1_dsp_dapm_widgets,
                        ARRAY_SIZE(adau17x1_dsp_dapm_widgets));
                if (ret)
                        return ret;
@@ -840,21 +841,20 @@ EXPORT_SYMBOL_GPL(adau17x1_add_widgets);
 
 int adau17x1_add_routes(struct snd_soc_codec *codec)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct adau *adau = snd_soc_codec_get_drvdata(codec);
        int ret;
 
-       ret = snd_soc_dapm_add_routes(&codec->dapm, adau17x1_dapm_routes,
+       ret = snd_soc_dapm_add_routes(dapm, adau17x1_dapm_routes,
                ARRAY_SIZE(adau17x1_dapm_routes));
        if (ret)
                return ret;
 
        if (adau17x1_has_dsp(adau)) {
-               ret = snd_soc_dapm_add_routes(&codec->dapm,
-                       adau17x1_dsp_dapm_routes,
+               ret = snd_soc_dapm_add_routes(dapm, adau17x1_dsp_dapm_routes,
                        ARRAY_SIZE(adau17x1_dsp_dapm_routes));
        } else {
-               ret = snd_soc_dapm_add_routes(&codec->dapm,
-                       adau17x1_no_dsp_dapm_routes,
+               ret = snd_soc_dapm_add_routes(dapm, adau17x1_no_dsp_dapm_routes,
                        ARRAY_SIZE(adau17x1_no_dsp_dapm_routes));
        }
        return ret;