Merge branch 'topic/asoc' into for-linus

[safe/jmp/linux-2.6] / sound / soc / codecs / wm8400.c

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 6acc885..7f5d080 100644 (file)
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -77,7 +77,7 @@ struct wm8400_priv {
 static inline unsigned int wm8400_read(struct snd_soc_codec *codec,
                                       unsigned int reg)
 {
-       struct wm8400_priv *wm8400 = codec->private_data;
+       struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
 
        if (reg == WM8400_INTDRIVBITS)
                return wm8400->fake_register;
@@ -91,7 +91,7 @@ static inline unsigned int wm8400_read(struct snd_soc_codec *codec,
 static int wm8400_write(struct snd_soc_codec *codec, unsigned int reg,
        unsigned int value)
 {
-       struct wm8400_priv *wm8400 = codec->private_data;
+       struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
 
        if (reg == WM8400_INTDRIVBITS) {
                wm8400->fake_register = value;
@@ -102,7 +102,7 @@ static int wm8400_write(struct snd_soc_codec *codec, unsigned int reg,
 
 static void wm8400_codec_reset(struct snd_soc_codec *codec)
 {
-       struct wm8400_priv *wm8400 = codec->private_data;
+       struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
 
        wm8400_reset_codec_reg_cache(wm8400->wm8400);
 }
@@ -926,7 +926,7 @@ static int wm8400_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 wm8400_priv *wm8400 = codec->private_data;
+       struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
 
        wm8400->sysclk = freq;
        return 0;
@@ -1015,7 +1015,7 @@ static int wm8400_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
                              unsigned int freq_out)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
-       struct wm8400_priv *wm8400 = codec->private_data;
+       struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
        struct fll_factors factors;
        int ret;
        u16 reg;
@@ -1204,7 +1204,7 @@ static int wm8400_mute(struct snd_soc_dai *dai, int mute)
 static int wm8400_set_bias_level(struct snd_soc_codec *codec,
                                 enum snd_soc_bias_level level)
 {
-       struct wm8400_priv *wm8400 = codec->private_data;
+       struct wm8400_priv *wm8400 = snd_soc_codec_get_drvdata(codec);
        u16 val;
        int ret;
 
@@ -1467,7 +1467,7 @@ static int wm8400_codec_probe(struct platform_device *dev)
                return -ENOMEM;
 
        codec = &priv->codec;
-       codec->private_data = priv;
+       snd_soc_codec_set_drvdata(codec, priv);
        codec->control_data = dev_get_drvdata(&dev->dev);
        priv->wm8400 = dev_get_drvdata(&dev->dev);
 
@@ -1530,7 +1530,7 @@ err:
 
 static int __exit wm8400_codec_remove(struct platform_device *dev)
 {
-       struct wm8400_priv *priv = wm8400_codec->private_data;
+       struct wm8400_priv *priv = snd_soc_codec_get_drvdata(wm8400_codec);
        u16 reg;
 
        snd_soc_unregister_dai(&wm8400_dai);