diff options
Diffstat (limited to 'sound/soc/codecs/wm8804.c')
-rw-r--r-- | sound/soc/codecs/wm8804.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 4599e8e95aa2..6dae1b40c9f7 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
24 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
25 | #include <sound/soc.h> | 25 | #include <sound/soc.h> |
26 | #include <sound/soc-dapm.h> | ||
27 | #include <sound/initval.h> | 26 | #include <sound/initval.h> |
28 | #include <sound/tlv.h> | 27 | #include <sound/tlv.h> |
29 | 28 | ||
@@ -515,7 +514,7 @@ static int wm8804_set_bias_level(struct snd_soc_codec *codec, | |||
515 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0); | 514 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x9, 0); |
516 | break; | 515 | break; |
517 | case SND_SOC_BIAS_STANDBY: | 516 | case SND_SOC_BIAS_STANDBY: |
518 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 517 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
519 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8804->supplies), | 518 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8804->supplies), |
520 | wm8804->supplies); | 519 | wm8804->supplies); |
521 | if (ret) { | 520 | if (ret) { |
@@ -537,7 +536,7 @@ static int wm8804_set_bias_level(struct snd_soc_codec *codec, | |||
537 | break; | 536 | break; |
538 | } | 537 | } |
539 | 538 | ||
540 | codec->bias_level = level; | 539 | codec->dapm.bias_level = level; |
541 | return 0; | 540 | return 0; |
542 | } | 541 | } |
543 | 542 | ||
@@ -581,7 +580,7 @@ static int wm8804_probe(struct snd_soc_codec *codec) | |||
581 | wm8804 = snd_soc_codec_get_drvdata(codec); | 580 | wm8804 = snd_soc_codec_get_drvdata(codec); |
582 | wm8804->codec = codec; | 581 | wm8804->codec = codec; |
583 | 582 | ||
584 | codec->idle_bias_off = 1; | 583 | codec->dapm.idle_bias_off = 1; |
585 | 584 | ||
586 | ret = snd_soc_codec_set_cache_io(codec, 8, 8, wm8804->control_type); | 585 | ret = snd_soc_codec_set_cache_io(codec, 8, 8, wm8804->control_type); |
587 | if (ret < 0) { | 586 | if (ret < 0) { |