1 files changed, 17 insertions, 17 deletions

diff --git a/sound/soc/codecs/wm8994_herring.c b/sound/soc/codecs/wm8994_herring.c
index bb67f85..6db5065 100755
--- a/sound/soc/codecs/wm8994_herring.c
+++ b/sound/soc/codecs/wm8994_herring.c
@@ -1121,7 +1121,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)
 /* S5P_SLEEP_CONFIG must be controlled by codec if codec use XUSBTI */
 int wm8994_configure_clock(struct snd_soc_codec *codec, int en)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	if (en) {
 		clk_enable(wm8994->codec_clk);
@@ -1165,7 +1165,7 @@ static int wm8994_earsel_control(struct wm8994_platform_data *pdata, int en)
 /* Audio Routing routines for the universal board..wm8994 codec*/
 void wm8994_disable_path(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	u16 val;
 	enum audio_path path = wm8994->cur_path;
@@ -1330,7 +1330,7 @@ void wm8994_disable_path(struct snd_soc_codec *codec)
 
 void wm8994_disable_rec_path(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	u16 val;
 	enum mic_path mic = wm8994->rec_path;
@@ -1514,7 +1514,7 @@ void wm8994_set_bluetooth_common_setting(struct snd_soc_codec *codec)
 
 void wm8994_record_headset_mic(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	u16 val;
 
@@ -1627,7 +1627,7 @@ void wm8994_record_headset_mic(struct snd_soc_codec *codec)
 
 void wm8994_record_main_mic(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	u16 val;
 
@@ -1894,7 +1894,7 @@ void wm8994_set_playback_receiver(struct snd_soc_codec *codec)
 
 void wm8994_set_playback_headset(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	u16 val;
 
@@ -2077,7 +2077,7 @@ void wm8994_set_playback_headset(struct snd_soc_codec *codec)
 
 void wm8994_set_playback_speaker(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	u16 val;
 
@@ -2185,7 +2185,7 @@ void wm8994_set_playback_speaker(struct snd_soc_codec *codec)
 
 void wm8994_set_playback_speaker_headset(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	u16 val;
 
@@ -2595,7 +2595,7 @@ void wm8994_set_voicecall_common_setting(struct snd_soc_codec *codec)
 
 static void wm8994_set_cdma_voicecall_receiver(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -2716,7 +2716,7 @@ static void wm8994_set_cdma_voicecall_receiver(struct snd_soc_codec *codec)
 
 static void wm8994_set_gsm_voicecall_receiver(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -2818,7 +2818,7 @@ void wm8994_set_voicecall_receiver(struct snd_soc_codec *codec)
 
 void wm8994_set_voicecall_headset(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -2983,7 +2983,7 @@ void wm8994_set_voicecall_headset(struct snd_soc_codec *codec)
 
 void wm8994_set_voicecall_headphone(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -3140,7 +3140,7 @@ void wm8994_set_voicecall_headphone(struct snd_soc_codec *codec)
 
 void wm8994_set_voicecall_speaker(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -3305,7 +3305,7 @@ void wm8994_set_voicecall_bluetooth(struct snd_soc_codec *codec)
 
 void wm8994_set_voicecall_tty_vco(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -3462,7 +3462,7 @@ void wm8994_set_voicecall_tty_vco(struct snd_soc_codec *codec)
 
 void wm8994_set_voicecall_tty_hco(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -3632,7 +3632,7 @@ void wm8994_set_voicecall_tty_hco(struct snd_soc_codec *codec)
 
 void wm8994_set_voicecall_tty_full(struct snd_soc_codec *codec)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	int val;
 
@@ -3792,7 +3792,7 @@ void wm8994_set_voicecall_tty_full(struct snd_soc_codec *codec)
 
 int wm8994_set_codec_gain(struct snd_soc_codec *codec, u16 mode, u16 device)
 {
-	struct wm8994_priv *wm8994 = codec->drvdata;
+	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 	int i;
 	u32 gain_set_bits = COMMON_SET_BIT;
 	u16 val;