diff options
Diffstat (limited to 'sound/soc/codecs/wm8776.c')
-rw-r--r-- | sound/soc/codecs/wm8776.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 0132a27140ae..8e7953b1b790 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <sound/pcm.h> | 25 | #include <sound/pcm.h> |
26 | #include <sound/pcm_params.h> | 26 | #include <sound/pcm_params.h> |
27 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
28 | #include <sound/soc-dapm.h> | ||
29 | #include <sound/initval.h> | 28 | #include <sound/initval.h> |
30 | #include <sound/tlv.h> | 29 | #include <sound/tlv.h> |
31 | 30 | ||
@@ -306,7 +305,7 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, | |||
306 | case SND_SOC_BIAS_PREPARE: | 305 | case SND_SOC_BIAS_PREPARE: |
307 | break; | 306 | break; |
308 | case SND_SOC_BIAS_STANDBY: | 307 | case SND_SOC_BIAS_STANDBY: |
309 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 308 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
310 | /* Disable the global powerdown; DAPM does the rest */ | 309 | /* Disable the global powerdown; DAPM does the rest */ |
311 | snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); | 310 | snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0); |
312 | } | 311 | } |
@@ -317,7 +316,7 @@ static int wm8776_set_bias_level(struct snd_soc_codec *codec, | |||
317 | break; | 316 | break; |
318 | } | 317 | } |
319 | 318 | ||
320 | codec->bias_level = level; | 319 | codec->dapm.bias_level = level; |
321 | return 0; | 320 | return 0; |
322 | } | 321 | } |
323 | 322 | ||
@@ -404,6 +403,7 @@ static int wm8776_resume(struct snd_soc_codec *codec) | |||
404 | static int wm8776_probe(struct snd_soc_codec *codec) | 403 | static int wm8776_probe(struct snd_soc_codec *codec) |
405 | { | 404 | { |
406 | struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); | 405 | struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec); |
406 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
407 | int ret = 0; | 407 | int ret = 0; |
408 | 408 | ||
409 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type); | 409 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type); |
@@ -427,9 +427,9 @@ static int wm8776_probe(struct snd_soc_codec *codec) | |||
427 | 427 | ||
428 | snd_soc_add_controls(codec, wm8776_snd_controls, | 428 | snd_soc_add_controls(codec, wm8776_snd_controls, |
429 | ARRAY_SIZE(wm8776_snd_controls)); | 429 | ARRAY_SIZE(wm8776_snd_controls)); |
430 | snd_soc_dapm_new_controls(codec, wm8776_dapm_widgets, | 430 | snd_soc_dapm_new_controls(dapm, wm8776_dapm_widgets, |
431 | ARRAY_SIZE(wm8776_dapm_widgets)); | 431 | ARRAY_SIZE(wm8776_dapm_widgets)); |
432 | snd_soc_dapm_add_routes(codec, routes, ARRAY_SIZE(routes)); | 432 | snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes)); |
433 | 433 | ||
434 | return ret; | 434 | return ret; |
435 | } | 435 | } |