Merge branch 'topic/asoc' into for-linus

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

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index b5b7d6a..f0e00fd 100644 (file)
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -49,7 +49,7 @@ struct aic26 {
 static unsigned int aic26_reg_read(struct snd_soc_codec *codec,
                                   unsigned int reg)
 {
-       struct aic26 *aic26 = codec->private_data;
+       struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
        u16 *cache = codec->reg_cache;
        u16 cmd, value;
        u8 buffer[2];
@@ -93,7 +93,7 @@ static unsigned int aic26_reg_read_cache(struct snd_soc_codec *codec,
 static int aic26_reg_write(struct snd_soc_codec *codec, unsigned int reg,
                           unsigned int value)
 {
-       struct aic26 *aic26 = codec->private_data;
+       struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
        u16 *cache = codec->reg_cache;
        u16 cmd;
        u8 buffer[4];
@@ -132,7 +132,7 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_device *socdev = rtd->socdev;
        struct snd_soc_codec *codec = socdev->card->codec;
-       struct aic26 *aic26 = codec->private_data;
+       struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
        int fsref, divisor, wlen, pval, jval, dval, qval;
        u16 reg;
 
@@ -199,7 +199,7 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,
 static int aic26_mute(struct snd_soc_dai *dai, int mute)
 {
        struct snd_soc_codec *codec = dai->codec;
-       struct aic26 *aic26 = codec->private_data;
+       struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
        u16 reg = aic26_reg_read_cache(codec, AIC26_REG_DAC_GAIN);
 
        dev_dbg(&aic26->spi->dev, "aic26_mute(dai=%p, mute=%i)\n",
@@ -218,7 +218,7 @@ static int aic26_set_sysclk(struct snd_soc_dai *codec_dai,
                            int clk_id, unsigned int freq, int dir)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
-       struct aic26 *aic26 = codec->private_data;
+       struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
 
        dev_dbg(&aic26->spi->dev, "aic26_set_sysclk(dai=%p, clk_id==%i,"
                " freq=%i, dir=%i)\n",
@@ -235,7 +235,7 @@ static int aic26_set_sysclk(struct snd_soc_dai *codec_dai,
 static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
-       struct aic26 *aic26 = codec->private_data;
+       struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
 
        dev_dbg(&aic26->spi->dev, "aic26_set_fmt(dai=%p, fmt==%i)\n",
                codec_dai, fmt);
@@ -431,7 +431,7 @@ static int aic26_spi_probe(struct spi_device *spi)
        /* Setup what we can in the codec structure so that the register
         * access functions will work as expected.  More will be filled
         * out when it is probed by the SoC CODEC part of this driver */
-       aic26->codec.private_data = aic26;
+       snd_soc_codec_set_drvdata(&aic26->codec, aic26);
        aic26->codec.name = "aic26";
        aic26->codec.owner = THIS_MODULE;
        aic26->codec.dai = &aic26_dai;