Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus

diff --combined sound/soc/codecs/wm8994.c
index 1d4b1ec,1b89aa9..ba832b7
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -290,8 -290,10 +290,8 @@@ static const DECLARE_TLV_DB_SCALE(ng_tl
  static const DECLARE_TLV_DB_SCALE(mixin_boost_tlv, 0, 900, 0);
  
  #define WM8994_DRC_SWITCH(xname, reg, shift) \
 -{     .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
 -      .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
 -      .put = wm8994_put_drc_sw, \
 -      .private_value =  SOC_SINGLE_VALUE(reg, shift, 1, 0) }
 +      SOC_SINGLE_EXT(xname, reg, shift, 1, 0, \
 +              snd_soc_get_volsw, wm8994_put_drc_sw)
  
  static int wm8994_put_drc_sw(struct snd_kcontrol *kcontrol,
                             struct snd_ctl_elem_value *ucontrol)
@@@ -1431,8 -1433,10 +1431,8 @@@ SOC_DAPM_SINGLE("AIF1.1 Switch", WM8994
  };
  
  #define WM8994_CLASS_W_SWITCH(xname, reg, shift, max, invert) \
 -{     .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
 -      .info = snd_soc_info_volsw, \
 -      .get = snd_soc_dapm_get_volsw, .put = wm8994_put_class_w, \
 -      .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
 +      SOC_SINGLE_EXT(xname, reg, shift, max, invert, \
 +              snd_soc_get_volsw, wm8994_put_class_w)
  
  static int wm8994_put_class_w(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
@@@ -3852,8 -3856,6 +3852,6 @@@ static void wm8958_mic_work(struct work
                                                  mic_complete_work.work);
        struct snd_soc_codec *codec = wm8994->hubs.codec;
  
-       dev_crit(codec->dev, "MIC WORK %x\n", wm8994->mic_status);
- 
        pm_runtime_get_sync(codec->dev);
  
        mutex_lock(&wm8994->accdet_lock);
@@@ -3863,8 -3865,6 +3861,6 @@@
        mutex_unlock(&wm8994->accdet_lock);
  
        pm_runtime_put(codec->dev);
- 
-       dev_crit(codec->dev, "MIC WORK %x DONE\n", wm8994->mic_status);
  }
  
  static irqreturn_t wm8958_mic_irq(int irq, void *data)