19 files changed, 62 insertions, 68 deletions

diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index b67480f1b1aa..4373ada95648 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -317,7 +317,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
-        unsigned int deemph = ucontrol->value.enumerated.item[0];
+        unsigned int deemph = ucontrol->value.integer.value[0];
 
         if (deemph > 1)
                 return -EINVAL;
@@ -333,7 +333,7 @@ static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = adav80x->deemph;
+        ucontrol->value.integer.value[0] = adav80x->deemph;
         return 0;
 };
 
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 70861c7b1631..81b54a270bd8 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -76,7 +76,7 @@ static int ak4641_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
-        int deemph = ucontrol->value.enumerated.item[0];
+        int deemph = ucontrol->value.integer.value[0];
 
         if (deemph > 1)
                 return -EINVAL;
@@ -92,7 +92,7 @@ static int ak4641_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct ak4641_priv *ak4641 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = ak4641->deemph;
+        ucontrol->value.integer.value[0] = ak4641->deemph;
         return 0;
 };
 
diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 632e89f793a7..2a58b1dccd2f 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -343,25 +343,25 @@ static const struct snd_soc_dapm_widget ak4671_dapm_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route ak4671_intercon[] = {
-        {"DAC Left", "NULL", "PMPLL"},
-        {"DAC Right", "NULL", "PMPLL"},
-        {"ADC Left", "NULL", "PMPLL"},
-        {"ADC Right", "NULL", "PMPLL"},
+        {"DAC Left", NULL, "PMPLL"},
+        {"DAC Right", NULL, "PMPLL"},
+        {"ADC Left", NULL, "PMPLL"},
+        {"ADC Right", NULL, "PMPLL"},
 
         /* Outputs */
-        {"LOUT1", "NULL", "LOUT1 Mixer"},
-        {"ROUT1", "NULL", "ROUT1 Mixer"},
-        {"LOUT2", "NULL", "LOUT2 Mix Amp"},
-        {"ROUT2", "NULL", "ROUT2 Mix Amp"},
-        {"LOUT3", "NULL", "LOUT3 Mixer"},
-        {"ROUT3", "NULL", "ROUT3 Mixer"},
+        {"LOUT1", NULL, "LOUT1 Mixer"},
+        {"ROUT1", NULL, "ROUT1 Mixer"},
+        {"LOUT2", NULL, "LOUT2 Mix Amp"},
+        {"ROUT2", NULL, "ROUT2 Mix Amp"},
+        {"LOUT3", NULL, "LOUT3 Mixer"},
+        {"ROUT3", NULL, "ROUT3 Mixer"},
 
         {"LOUT1 Mixer", "DACL", "DAC Left"},
         {"ROUT1 Mixer", "DACR", "DAC Right"},
         {"LOUT2 Mixer", "DACHL", "DAC Left"},
         {"ROUT2 Mixer", "DACHR", "DAC Right"},
-        {"LOUT2 Mix Amp", "NULL", "LOUT2 Mixer"},
-        {"ROUT2 Mix Amp", "NULL", "ROUT2 Mixer"},
+        {"LOUT2 Mix Amp", NULL, "LOUT2 Mixer"},
+        {"ROUT2 Mix Amp", NULL, "ROUT2 Mixer"},
         {"LOUT3 Mixer", "DACSL", "DAC Left"},
         {"ROUT3 Mixer", "DACSR", "DAC Right"},
 
@@ -381,18 +381,18 @@ static const struct snd_soc_dapm_route ak4671_intercon[] = {
         {"LIN2", NULL, "Mic Bias"},
         {"RIN2", NULL, "Mic Bias"},
 
-        {"ADC Left", "NULL", "LIN MUX"},
-        {"ADC Right", "NULL", "RIN MUX"},
+        {"ADC Left", NULL, "LIN MUX"},
+        {"ADC Right", NULL, "RIN MUX"},
 
         /* Analog Loops */
-        {"LIN1 Mixing Circuit", "NULL", "LIN1"},
-        {"RIN1 Mixing Circuit", "NULL", "RIN1"},
-        {"LIN2 Mixing Circuit", "NULL", "LIN2"},
-        {"RIN2 Mixing Circuit", "NULL", "RIN2"},
-        {"LIN3 Mixing Circuit", "NULL", "LIN3"},
-        {"RIN3 Mixing Circuit", "NULL", "RIN3"},
-        {"LIN4 Mixing Circuit", "NULL", "LIN4"},
-        {"RIN4 Mixing Circuit", "NULL", "RIN4"},
+        {"LIN1 Mixing Circuit", NULL, "LIN1"},
+        {"RIN1 Mixing Circuit", NULL, "RIN1"},
+        {"LIN2 Mixing Circuit", NULL, "LIN2"},
+        {"RIN2 Mixing Circuit", NULL, "RIN2"},
+        {"LIN3 Mixing Circuit", NULL, "LIN3"},
+        {"RIN3 Mixing Circuit", NULL, "RIN3"},
+        {"LIN4 Mixing Circuit", NULL, "LIN4"},
+        {"RIN4 Mixing Circuit", NULL, "RIN4"},
 
         {"LOUT1 Mixer", "LINL1", "LIN1 Mixing Circuit"},
         {"ROUT1 Mixer", "RINR1", "RIN1 Mixing Circuit"},
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 79a4efcb894c..7d3a6accaf9a 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -286,7 +286,7 @@ static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = cs4271->deemph;
+        ucontrol->value.integer.value[0] = cs4271->deemph;
         return 0;
 }
 
@@ -296,7 +296,7 @@ static int cs4271_put_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
 
-        cs4271->deemph = ucontrol->value.enumerated.item[0];
+        cs4271->deemph = ucontrol->value.integer.value[0];
         return cs4271_set_deemph(codec);
 }
 
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index ffe96175a8a5..911c26c705fc 100644
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -876,11 +876,11 @@ static const struct snd_soc_dapm_widget da732x_dapm_widgets[] = {
 
 static const struct snd_soc_dapm_route da732x_dapm_routes[] = {
         /* Inputs */
-        {"AUX1L PGA", "NULL", "AUX1L"},
-        {"AUX1R PGA", "NULL", "AUX1R"},
+        {"AUX1L PGA", NULL, "AUX1L"},
+        {"AUX1R PGA", NULL, "AUX1R"},
         {"MIC1 PGA", NULL, "MIC1"},
-        {"MIC2 PGA", "NULL", "MIC2"},
-        {"MIC3 PGA", "NULL", "MIC3"},
+        {"MIC2 PGA", NULL, "MIC2"},
+        {"MIC3 PGA", NULL, "MIC3"},
 
         /* Capture Path */
         {"ADC1 Left MUX", "MIC1", "MIC1 PGA"},
diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
index f27325155ace..c5f35a07e8e4 100644
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
@@ -120,7 +120,7 @@ static int es8328_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = es8328->deemph;
+        ucontrol->value.integer.value[0] = es8328->deemph;
         return 0;
 }
 
@@ -129,7 +129,7 @@ static int es8328_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec);
-        int deemph = ucontrol->value.enumerated.item[0];
+        int deemph = ucontrol->value.integer.value[0];
         int ret;
 
         if (deemph > 1)
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index a722a023c262..477e13d30971 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -118,7 +118,7 @@ static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = priv->deemph;
+        ucontrol->value.integer.value[0] = priv->deemph;
 
         return 0;
 }
@@ -129,7 +129,7 @@ static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);
 
-        priv->deemph = ucontrol->value.enumerated.item[0];
+        priv->deemph = ucontrol->value.integer.value[0];
 
         return pcm1681_set_deemph(codec);
 }
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c
index f374840a5a7c..9b541e52da8c 100644
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
@@ -1198,7 +1198,7 @@ static struct dmi_system_id dmi_dell_dino[] = {
                 .ident = "Dell Dino",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-                        DMI_MATCH(DMI_BOARD_NAME, "0144P8")
+                        DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9343")
                 }
         },
         { }
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index e182e6569bbd..3593a1496056 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1151,13 +1151,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_codec *codec)
                 /* Enable VDDC charge pump */
                 ana_pwr |= SGTL5000_VDDC_CHRGPMP_POWERUP;
         } else if (vddio >= 3100 && vdda >= 3100) {
-                /*
-                 * if vddio and vddd > 3.1v,
-                 * charge pump should be clean before set ana_pwr
-                 */
-                snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,
-                                SGTL5000_VDDC_CHRGPMP_POWERUP, 0);
-
+                ana_pwr &= ~SGTL5000_VDDC_CHRGPMP_POWERUP;
                 /* VDDC use VDDIO rail */
                 lreg_ctrl |= SGTL5000_VDDC_ASSN_OVRD;
                 lreg_ctrl |= SGTL5000_VDDC_MAN_ASSN_VDDIO <<
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 47b257e41809..82095d6cd070 100644
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -538,8 +538,8 @@ static const struct snd_soc_dapm_route sn95031_audio_map[] = {
         /* speaker map */
         { "IHFOUTL", NULL, "Speaker Rail"},
         { "IHFOUTR", NULL, "Speaker Rail"},
-        { "IHFOUTL", "NULL", "Speaker Left Playback"},
-        { "IHFOUTR", "NULL", "Speaker Right Playback"},
+        { "IHFOUTL", NULL, "Speaker Left Playback"},
+        { "IHFOUTR", NULL, "Speaker Right Playback"},
         { "Speaker Left Playback", NULL, "Speaker Left Filter"},
         { "Speaker Right Playback", NULL, "Speaker Right Filter"},
         { "Speaker Left Filter", NULL, "IHFDAC Left"},
diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index 249ef5c4c762..32942bed34b1 100644
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -281,7 +281,7 @@ static int tas5086_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = priv->deemph;
+        ucontrol->value.integer.value[0] = priv->deemph;
 
         return 0;
 }
@@ -292,7 +292,7 @@ static int tas5086_put_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct tas5086_private *priv = snd_soc_codec_get_drvdata(codec);
 
-        priv->deemph = ucontrol->value.enumerated.item[0];
+        priv->deemph = ucontrol->value.integer.value[0];
 
         return tas5086_set_deemph(codec);
 }
diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c
index 8d9de49a5052..21d5402e343f 100644
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
@@ -610,7 +610,7 @@ static int wm2000_anc_mode_get(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
 
-        ucontrol->value.enumerated.item[0] = wm2000->anc_active;
+        ucontrol->value.integer.value[0] = wm2000->anc_active;
 
         return 0;
 }
@@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
-        int anc_active = ucontrol->value.enumerated.item[0];
+        int anc_active = ucontrol->value.integer.value[0];
         int ret;
 
         if (anc_active > 1)
@@ -643,7 +643,7 @@ static int wm2000_speaker_get(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
 
-        ucontrol->value.enumerated.item[0] = wm2000->spk_ena;
+        ucontrol->value.integer.value[0] = wm2000->spk_ena;
 
         return 0;
 }
@@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev);
-        int val = ucontrol->value.enumerated.item[0];
+        int val = ucontrol->value.integer.value[0];
         int ret;
 
         if (val > 1)
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 098c143f44d6..c6d10533e2bd 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -125,7 +125,7 @@ static int wm8731_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = wm8731->deemph;
+        ucontrol->value.integer.value[0] = wm8731->deemph;
 
         return 0;
 }
@@ -135,7 +135,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
-        int deemph = ucontrol->value.enumerated.item[0];
+        int deemph = ucontrol->value.integer.value[0];
         int ret = 0;
 
         if (deemph > 1)
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index dde462c082be..04b04f8e147c 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -442,7 +442,7 @@ static int wm8903_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = wm8903->deemph;
+        ucontrol->value.integer.value[0] = wm8903->deemph;
 
         return 0;
 }
@@ -452,7 +452,7 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
-        int deemph = ucontrol->value.enumerated.item[0];
+        int deemph = ucontrol->value.integer.value[0];
         int ret = 0;
 
         if (deemph > 1)
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index d3b3f57668cc..215e93c1ddf0 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -525,7 +525,7 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = wm8904->deemph;
+        ucontrol->value.integer.value[0] = wm8904->deemph;
         return 0;
 }
 
@@ -534,7 +534,7 @@ static int wm8904_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);
-        int deemph = ucontrol->value.enumerated.item[0];
+        int deemph = ucontrol->value.integer.value[0];
 
         if (deemph > 1)
                 return -EINVAL;
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index 1ab2d462afad..00bec915d652 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -393,7 +393,7 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = wm8955->deemph;
+        ucontrol->value.integer.value[0] = wm8955->deemph;
         return 0;
 }
 
@@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);
-        int deemph = ucontrol->value.enumerated.item[0];
+        int deemph = ucontrol->value.integer.value[0];
 
         if (deemph > 1)
                 return -EINVAL;
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c
index cf8fecf97f2c..3035d9856415 100644
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@ -184,7 +184,7 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
 
-        ucontrol->value.enumerated.item[0] = wm8960->deemph;
+        ucontrol->value.integer.value[0] = wm8960->deemph;
         return 0;
 }
 
@@ -193,7 +193,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);
         struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);
-        int deemph = ucontrol->value.enumerated.item[0];
+        int deemph = ucontrol->value.integer.value[0];
 
         if (deemph > 1)
                 return -EINVAL;
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 9517571e820d..98c9525bd751 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -180,7 +180,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
         struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
         struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
         struct wm9712_priv *wm9712 = snd_soc_codec_get_drvdata(codec);
-        unsigned int val = ucontrol->value.enumerated.item[0];
+        unsigned int val = ucontrol->value.integer.value[0];
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         unsigned int mixer, mask, shift, old;
@@ -193,7 +193,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
 
         mutex_lock(&wm9712->lock);
         old = wm9712->hp_mixer[mixer];
-        if (ucontrol->value.enumerated.item[0])
+        if (ucontrol->value.integer.value[0])
                 wm9712->hp_mixer[mixer] |= mask;
         else
                 wm9712->hp_mixer[mixer] &= ~mask;
@@ -231,7 +231,7 @@ static int wm9712_hp_mixer_get(struct snd_kcontrol *kcontrol,
         mixer = mc->shift >> 8;
         shift = mc->shift & 0xff;
 
-        ucontrol->value.enumerated.item[0] =
+        ucontrol->value.integer.value[0] =
                 (wm9712->hp_mixer[mixer] >> shift) & 1;
 
         return 0;
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index 68222917b396..79552953e1bd 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -255,7 +255,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,
         struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
         struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
         struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec);
-        unsigned int val = ucontrol->value.enumerated.item[0];
+        unsigned int val = ucontrol->value.integer.value[0];
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         unsigned int mixer, mask, shift, old;
@@ -268,7 +268,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,
 
         mutex_lock(&wm9713->lock);
         old = wm9713->hp_mixer[mixer];
-        if (ucontrol->value.enumerated.item[0])
+        if (ucontrol->value.integer.value[0])
                 wm9713->hp_mixer[mixer] |= mask;
         else
                 wm9713->hp_mixer[mixer] &= ~mask;
@@ -306,7 +306,7 @@ static int wm9713_hp_mixer_get(struct snd_kcontrol *kcontrol,
         mixer = mc->shift >> 8;
         shift = mc->shift & 0xff;
 
-        ucontrol->value.enumerated.item[0] =
+        ucontrol->value.integer.value[0] =
                 (wm9713->hp_mixer[mixer] >> shift) & 1;
 
         return 0;