Merge branch 'topic/asoc' into for-linus

Conflicts:
	sound/soc/codecs/ad1938.c

1 files changed, 2 insertions, 3 deletions

diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 0c04b476487f..e3c4bbfaae27 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -581,7 +581,7 @@ static int wm8940_set_dai_sysclk(struct snd_soc_dai *codec_dai,
                                  int clk_id, unsigned int freq, int dir)
 {
         struct snd_soc_codec *codec = codec_dai->codec;
-        struct wm8940_priv *wm8940 = codec->private_data;
+        struct wm8940_priv *wm8940 = snd_soc_codec_get_drvdata(codec);
 
         switch (freq) {
         case 11289600:
@@ -692,7 +692,6 @@ static int wm8940_resume(struct platform_device *pdev)
         ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         if (ret)
                 goto error_ret;
-        ret = wm8940_set_bias_level(codec, codec->suspend_bias_level);
 
 error_ret:
         return ret;
@@ -773,7 +772,7 @@ static int wm8940_register(struct wm8940_priv *wm8940,
         INIT_LIST_HEAD(&codec->dapm_widgets);
         INIT_LIST_HEAD(&codec->dapm_paths);
 
-        codec->private_data = wm8940;
+        snd_soc_codec_set_drvdata(codec, wm8940);
         codec->name = "WM8940";
         codec->owner = THIS_MODULE;
         codec->bias_level = SND_SOC_BIAS_OFF;