Merge branch 'for-2.6.37' into for-2.6.38

diff --cc sound/soc/codecs/max98088.c
Simple merge

diff --cc sound/soc/codecs/wm8523.c
Simple merge

diff --cc sound/soc/codecs/wm8741.c
Simple merge

diff --cc sound/soc/codecs/wm8753.c
index 73507e7,87caae5..79b02ae
--- 1/sound/soc/codecs/wm8753.c
--- 2/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@@ -1286,13 -1239,13 +1239,13 @@@ static int wm8753_set_bias_level(struc
                break;
        case SND_SOC_BIAS_STANDBY:
                /* mute dac and set vmid to 500k, enable VREF */
-               wm8753_write(codec, WM8753_PWR1, pwr_reg | 0x0141);
+               snd_soc_write(codec, WM8753_PWR1, pwr_reg | 0x0141);
                break;
        case SND_SOC_BIAS_OFF:
-               wm8753_write(codec, WM8753_PWR1, 0x0001);
+               snd_soc_write(codec, WM8753_PWR1, 0x0001);
                break;
        }
 -      codec->bias_level = level;
 +      codec->dapm.bias_level = level;
        return 0;
  }
  
@@@ -1531,9 -1479,28 +1481,9 @@@ static int wm8753_resume(struct snd_soc
  static int wm8753_probe(struct snd_soc_codec *codec)
  {
        struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
-       int ret = 0, reg;
+       int ret;
  
 -      INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
 +      INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8753_work);
  
        ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type);
        if (ret < 0) {

diff --cc sound/soc/codecs/wm8904.c
Simple merge

diff --cc sound/soc/codecs/wm8940.c
Simple merge

diff --cc sound/soc/codecs/wm8955.c
Simple merge

diff --cc sound/soc/codecs/wm8960.c
Simple merge

diff --cc sound/soc/codecs/wm8962.c
Simple merge

diff --cc sound/soc/codecs/wm8971.c
Simple merge

diff --cc sound/soc/codecs/wm9081.c
Simple merge

diff --cc sound/soc/codecs/wm9090.c
Simple merge