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

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

diff --git a/kernel/sound/soc/codecs/adau1761.c b/kernel/sound/soc/codecs/adau1761.c
index a1baeee..2f12477 100644 (file)
--- a/kernel/sound/soc/codecs/adau1761.c
+++ b/kernel/sound/soc/codecs/adau1761.c
@@ -466,7 +466,6 @@ static int adau1761_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -483,6 +482,7 @@ static enum adau1761_output_mode adau1761_get_lineout_mode(
 
 static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct adau1761_platform_data *pdata = codec->dev->platform_data;
        struct adau *adau = snd_soc_codec_get_drvdata(codec);
        enum adau1761_digmic_jackdet_pin_mode mode;
@@ -515,21 +515,18 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec)
                if (ret)
                        return ret;
        case ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: /* fallthrough */
-               ret = snd_soc_dapm_add_routes(&codec->dapm,
-                       adau1761_no_dmic_routes,
+               ret = snd_soc_dapm_add_routes(dapm, adau1761_no_dmic_routes,
                        ARRAY_SIZE(adau1761_no_dmic_routes));
                if (ret)
                        return ret;
                break;
        case ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC:
-               ret = snd_soc_dapm_new_controls(&codec->dapm,
-                       adau1761_dmic_widgets,
+               ret = snd_soc_dapm_new_controls(dapm, adau1761_dmic_widgets,
                        ARRAY_SIZE(adau1761_dmic_widgets));
                if (ret)
                        return ret;
 
-               ret = snd_soc_dapm_add_routes(&codec->dapm,
-                       adau1761_dmic_routes,
+               ret = snd_soc_dapm_add_routes(dapm, adau1761_dmic_routes,
                        ARRAY_SIZE(adau1761_dmic_routes));
                if (ret)
                        return ret;
@@ -547,6 +544,7 @@ static int adau1761_setup_digmic_jackdetect(struct snd_soc_codec *codec)
 
 static int adau1761_setup_headphone_mode(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);
        struct adau1761_platform_data *pdata = codec->dev->platform_data;
        enum adau1761_output_mode mode;
@@ -577,12 +575,12 @@ static int adau1761_setup_headphone_mode(struct snd_soc_codec *codec)
        }
 
        if (mode == ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS) {
-               ret = snd_soc_dapm_new_controls(&codec->dapm,
+               ret = snd_soc_dapm_new_controls(dapm,
                        adau1761_capless_dapm_widgets,
                        ARRAY_SIZE(adau1761_capless_dapm_widgets));
                if (ret)
                        return ret;
-               ret = snd_soc_dapm_add_routes(&codec->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                        adau1761_capless_dapm_routes,
                        ARRAY_SIZE(adau1761_capless_dapm_routes));
        } else {
@@ -590,12 +588,12 @@ static int adau1761_setup_headphone_mode(struct snd_soc_codec *codec)
                        ARRAY_SIZE(adau1761_mono_controls));
                if (ret)
                        return ret;
-               ret = snd_soc_dapm_new_controls(&codec->dapm,
+               ret = snd_soc_dapm_new_controls(dapm,
                        adau1761_mono_dapm_widgets,
                        ARRAY_SIZE(adau1761_mono_dapm_widgets));
                if (ret)
                        return ret;
-               ret = snd_soc_dapm_add_routes(&codec->dapm,
+               ret = snd_soc_dapm_add_routes(dapm,
                        adau1761_mono_dapm_routes,
                        ARRAY_SIZE(adau1761_mono_dapm_routes));
        }
@@ -640,6 +638,7 @@ static bool adau1761_readable_register(struct device *dev, unsigned int reg)
 
 static int adau1761_codec_probe(struct snd_soc_codec *codec)
 {
+       struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct adau1761_platform_data *pdata = codec->dev->platform_data;
        struct adau *adau = snd_soc_codec_get_drvdata(codec);
        int ret;
@@ -692,14 +691,12 @@ static int adau1761_codec_probe(struct snd_soc_codec *codec)
                return ret;
 
        if (adau->type == ADAU1761) {
-               ret = snd_soc_dapm_new_controls(&codec->dapm,
-                       adau1761_dapm_widgets,
+               ret = snd_soc_dapm_new_controls(dapm, adau1761_dapm_widgets,
                        ARRAY_SIZE(adau1761_dapm_widgets));
                if (ret)
                        return ret;
 
-               ret = snd_soc_dapm_add_routes(&codec->dapm,
-                       adau1761_dapm_routes,
+               ret = snd_soc_dapm_add_routes(dapm, adau1761_dapm_routes,
                        ARRAY_SIZE(adau1761_dapm_routes));
                if (ret)
                        return ret;