diff options
Diffstat (limited to 'sound/soc/codecs/wm8711.c')
-rw-r--r-- | sound/soc/codecs/wm8711.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 8ca3812f2f2f..effb14eee7d4 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c | |||
@@ -163,7 +163,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream, | |||
163 | struct snd_soc_dai *dai) | 163 | struct snd_soc_dai *dai) |
164 | { | 164 | { |
165 | struct snd_soc_codec *codec = dai->codec; | 165 | struct snd_soc_codec *codec = dai->codec; |
166 | struct wm8711_priv *wm8711 = codec->private_data; | 166 | struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec); |
167 | u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc; | 167 | u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc; |
168 | int i = get_coeff(wm8711->sysclk, params_rate(params)); | 168 | int i = get_coeff(wm8711->sysclk, params_rate(params)); |
169 | u16 srate = (coeff_div[i].sr << 2) | | 169 | u16 srate = (coeff_div[i].sr << 2) | |
@@ -227,7 +227,7 @@ static int wm8711_set_dai_sysclk(struct snd_soc_dai *codec_dai, | |||
227 | int clk_id, unsigned int freq, int dir) | 227 | int clk_id, unsigned int freq, int dir) |
228 | { | 228 | { |
229 | struct snd_soc_codec *codec = codec_dai->codec; | 229 | struct snd_soc_codec *codec = codec_dai->codec; |
230 | struct wm8711_priv *wm8711 = codec->private_data; | 230 | struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec); |
231 | 231 | ||
232 | switch (freq) { | 232 | switch (freq) { |
233 | case 11289600: | 233 | case 11289600: |
@@ -376,7 +376,7 @@ static int wm8711_resume(struct platform_device *pdev) | |||
376 | codec->hw_write(codec->control_data, data, 2); | 376 | codec->hw_write(codec->control_data, data, 2); |
377 | } | 377 | } |
378 | wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 378 | wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
379 | wm8711_set_bias_level(codec, codec->suspend_bias_level); | 379 | |
380 | return 0; | 380 | return 0; |
381 | } | 381 | } |
382 | 382 | ||
@@ -446,7 +446,7 @@ static int wm8711_register(struct wm8711_priv *wm8711, | |||
446 | INIT_LIST_HEAD(&codec->dapm_widgets); | 446 | INIT_LIST_HEAD(&codec->dapm_widgets); |
447 | INIT_LIST_HEAD(&codec->dapm_paths); | 447 | INIT_LIST_HEAD(&codec->dapm_paths); |
448 | 448 | ||
449 | codec->private_data = wm8711; | 449 | snd_soc_codec_set_drvdata(codec, wm8711); |
450 | codec->name = "WM8711"; | 450 | codec->name = "WM8711"; |
451 | codec->owner = THIS_MODULE; | 451 | codec->owner = THIS_MODULE; |
452 | codec->bias_level = SND_SOC_BIAS_OFF; | 452 | codec->bias_level = SND_SOC_BIAS_OFF; |