Merge remote-tracking branches 'asoc/topic/ssm4567', 'asoc/topic/sta32x', 'asoc/topic...

diff --cc sound/soc/codecs/stac9766.c
index f37a79e,53b810d,53b810d,53b810d,53b810d,6c62d29..dbff0c8
--- 1/sound/soc/codecs/stac9766.c
--- 2/sound/soc/codecs/stac9766.c
--- 3/sound/soc/codecs/stac9766.c
--- 4/sound/soc/codecs/stac9766.c
--- 5/sound/soc/codecs/stac9766.c
--- 6/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@@@@@@ -258,26 -254,25 -254,25 -254,25 -254,25 -254,19 +258,20 @@@@@@@ static int stac9766_reset(struct snd_so
        return 0;
      }
      
----- static int stac9766_codec_suspend(struct snd_soc_codec *codec)
----- {
-----   stac9766_set_bias_level(codec, SND_SOC_BIAS_OFF);
-----   return 0;
----- }
----- 
      static int stac9766_codec_resume(struct snd_soc_codec *codec)
      {
 +++++  struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
        u16 id, reset;
      
        reset = 0;
        /* give the codec an AC97 warm reset to start the link */
      reset:
        if (reset > 5) {
-----           printk(KERN_ERR "stac9766 failed to resume");
+++++           dev_err(codec->dev, "Failed to resume\n");
                return -EIO;
        }
 -----  codec->ac97->bus->ops->warm_reset(codec->ac97);
 -----  id = soc_ac97_ops->read(codec->ac97, AC97_VENDOR_ID2);
 +++++  ac97->bus->ops->warm_reset(ac97);
 +++++  id = soc_ac97_ops->read(ac97, AC97_VENDOR_ID2);
        if (id != 0x4c13) {
                stac9766_reset(codec, 0);
                reset++;