1 files changed, 8 insertions, 7 deletions

diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 357b609196e3..f0e00fd4b435 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -13,6 +13,7 @@
 #include <linux/device.h>
 #include <linux/sysfs.h>
 #include <linux/spi/spi.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -48,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];
@@ -92,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];
@@ -131,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;
 
@@ -198,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",
@@ -217,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",
@@ -234,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);
@@ -430,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;