1 files changed, 16 insertions, 16 deletions

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index bf59b8a4d1d7..4eb5a2e59f3c 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -175,7 +175,7 @@ static inline void twl4030_write_reg_cache(struct snd_soc_codec *codec,
 static int twl4030_write(struct snd_soc_codec *codec,
                         unsigned int reg, unsigned int value)
 {
-        struct twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         int write_to_reg = 0;
 
         twl4030_write_reg_cache(codec, reg, value);
@@ -220,7 +220,7 @@ static int twl4030_write(struct snd_soc_codec *codec,
 
 static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable)
 {
-        struct twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         int mode;
 
         if (enable == twl4030->codec_powered)
@@ -258,7 +258,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec)
 
 static void twl4030_apll_enable(struct snd_soc_codec *codec, int enable)
 {
-        struct twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         int status;
 
         if (enable == twl4030->apll_enabled)
@@ -279,7 +279,7 @@ static void twl4030_apll_enable(struct snd_soc_codec *codec, int enable)
 
 static void twl4030_power_up(struct snd_soc_codec *codec)
 {
-        struct twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         u8 anamicl, regmisc1, byte;
         int i = 0;
 
@@ -570,7 +570,7 @@ static int micpath_event(struct snd_soc_dapm_widget *w,
 static int pin_name##pga_event(struct snd_soc_dapm_widget *w,           \
                 struct snd_kcontrol *kcontrol, int event)               \
 {                                                                       \
-        struct twl4030_priv *twl4030 = w->codec->private_data;          \
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec); \
                                                                         \
         switch (event) {                                                \
         case SND_SOC_DAPM_POST_PMU:                                     \
@@ -678,7 +678,7 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
         struct twl4030_setup_data *setup = socdev->codec_data;
 
         unsigned char hs_gain, hs_pop;
-        struct twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         /* Base values for ramp delay calculation: 2^19 - 2^26 */
         unsigned int ramp_base[] = {524288, 1048576, 2097152, 4194304,
                                     8388608, 16777216, 33554432, 67108864};
@@ -741,7 +741,7 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
 static int headsetlpga_event(struct snd_soc_dapm_widget *w,
                 struct snd_kcontrol *kcontrol, int event)
 {
-        struct twl4030_priv *twl4030 = w->codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -765,7 +765,7 @@ static int headsetlpga_event(struct snd_soc_dapm_widget *w,
 static int headsetrpga_event(struct snd_soc_dapm_widget *w,
                 struct snd_kcontrol *kcontrol, int event)
 {
-        struct twl4030_priv *twl4030 = w->codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(w->codec);
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
@@ -957,7 +957,7 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned short val;
         unsigned short mask, bitmask;
@@ -1627,7 +1627,7 @@ static int twl4030_startup(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 twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
 
         if (twl4030->master_substream) {
                 twl4030->slave_substream = substream;
@@ -1658,7 +1658,7 @@ static void twl4030_shutdown(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 twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
 
         if (twl4030->master_substream == substream)
                 twl4030->master_substream = twl4030->slave_substream;
@@ -1684,7 +1684,7 @@ static int twl4030_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 twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         u8 mode, old_mode, format, old_format;
 
          /* If the substream has 4 channel, do the necessary setup */
@@ -1804,7 +1804,7 @@ static int twl4030_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 twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
 
         switch (freq) {
         case 19200000:
@@ -1919,7 +1919,7 @@ static int twl4030_voice_startup(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 twl4030_priv *twl4030 = codec->private_data;
+        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         u8 mode;
 
         /* If the system master clock is not 26MHz, the voice PCM interface is
@@ -2164,7 +2164,7 @@ static int twl4030_soc_probe(struct platform_device *pdev)
         BUG_ON(!twl4030_codec);
 
         codec = twl4030_codec;
-        twl4030 = codec->private_data;
+        twl4030 = snd_soc_codec_get_drvdata(codec);
         socdev->card->codec = codec;
 
         /* Configuration for headset ramp delay from setup data */
@@ -2227,7 +2227,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
         }
 
         codec = &twl4030->codec;
-        codec->private_data = twl4030;
+        snd_soc_codec_set_drvdata(codec, twl4030);
         codec->dev = &pdev->dev;
         twl4030_dai[0].dev = &pdev->dev;
         twl4030_dai[1].dev = &pdev->dev;