diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-10 07:24:23 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-14 22:49:40 -0400 |
commit | c16a7428912350a28f51df48c5f738523b1ecd8b (patch) | |
tree | 1439ecad90853949d8649195090985259866acdf /sound/soc | |
parent | dc43b0467115976ad90169ada94f6d8462469d6c (diff) |
ASoC: wm8770: Remove unneeded bias level manipulation
Since the device is now idle_bias_off these never have any useful effect,
the device will be brought to _OFF when idle, and will at best leave it
powered for longer.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8770.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 21ec563ad12b..8eefe429e384 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c | |||
@@ -572,23 +572,6 @@ static struct snd_soc_dai_driver wm8770_dai = { | |||
572 | .symmetric_rates = 1 | 572 | .symmetric_rates = 1 |
573 | }; | 573 | }; |
574 | 574 | ||
575 | #ifdef CONFIG_PM | ||
576 | static int wm8770_suspend(struct snd_soc_codec *codec) | ||
577 | { | ||
578 | wm8770_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
579 | return 0; | ||
580 | } | ||
581 | |||
582 | static int wm8770_resume(struct snd_soc_codec *codec) | ||
583 | { | ||
584 | wm8770_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
585 | return 0; | ||
586 | } | ||
587 | #else | ||
588 | #define wm8770_suspend NULL | ||
589 | #define wm8770_resume NULL | ||
590 | #endif | ||
591 | |||
592 | static int wm8770_probe(struct snd_soc_codec *codec) | 575 | static int wm8770_probe(struct snd_soc_codec *codec) |
593 | { | 576 | { |
594 | struct wm8770_priv *wm8770; | 577 | struct wm8770_priv *wm8770; |
@@ -642,8 +625,6 @@ static int wm8770_probe(struct snd_soc_codec *codec) | |||
642 | goto err_reg_enable; | 625 | goto err_reg_enable; |
643 | } | 626 | } |
644 | 627 | ||
645 | wm8770_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
646 | |||
647 | /* latch the volume update bits */ | 628 | /* latch the volume update bits */ |
648 | snd_soc_update_bits(codec, WM8770_MSDIGVOL, 0x100, 0x100); | 629 | snd_soc_update_bits(codec, WM8770_MSDIGVOL, 0x100, 0x100); |
649 | snd_soc_update_bits(codec, WM8770_MSALGVOL, 0x100, 0x100); | 630 | snd_soc_update_bits(codec, WM8770_MSALGVOL, 0x100, 0x100); |
@@ -680,7 +661,6 @@ static int wm8770_remove(struct snd_soc_codec *codec) | |||
680 | int i; | 661 | int i; |
681 | 662 | ||
682 | wm8770 = snd_soc_codec_get_drvdata(codec); | 663 | wm8770 = snd_soc_codec_get_drvdata(codec); |
683 | wm8770_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
684 | 664 | ||
685 | for (i = 0; i < ARRAY_SIZE(wm8770->supplies); ++i) | 665 | for (i = 0; i < ARRAY_SIZE(wm8770->supplies); ++i) |
686 | regulator_unregister_notifier(wm8770->supplies[i].consumer, | 666 | regulator_unregister_notifier(wm8770->supplies[i].consumer, |
@@ -692,8 +672,6 @@ static int wm8770_remove(struct snd_soc_codec *codec) | |||
692 | static struct snd_soc_codec_driver soc_codec_dev_wm8770 = { | 672 | static struct snd_soc_codec_driver soc_codec_dev_wm8770 = { |
693 | .probe = wm8770_probe, | 673 | .probe = wm8770_probe, |
694 | .remove = wm8770_remove, | 674 | .remove = wm8770_remove, |
695 | .suspend = wm8770_suspend, | ||
696 | .resume = wm8770_resume, | ||
697 | .set_bias_level = wm8770_set_bias_level, | 675 | .set_bias_level = wm8770_set_bias_level, |
698 | .idle_bias_off = true, | 676 | .idle_bias_off = true, |
699 | }; | 677 | }; |