Skip to content

Commit

Permalink
ASoC: wm9712: Cleanup manual bias level transitions
Browse files Browse the repository at this point in the history
Set the CODEC driver's suspend_bias_off flag rather than manually going to
SND_SOC_BIAS_OFF in suspend. This makes the code a bit shorter and cleaner.

The manual transition to SND_SOC_BIAS_STANDBY at the end of CODEC probe()
can also be removed as the core will automatically do this after the CODEC
has been probed.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Nov 24, 2014
1 parent 9a812c6 commit ab492b8
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions sound/soc/codecs/wm9712.c
Original file line number Diff line number Diff line change
Expand Up @@ -599,12 +599,6 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
return -EIO;
}

static int wm9712_soc_suspend(struct snd_soc_codec *codec)
{
wm9712_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}

static int wm9712_soc_resume(struct snd_soc_codec *codec)
{
int i, ret;
Expand Down Expand Up @@ -646,8 +640,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
/* set alc mux to none */
ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000);

wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

return 0;

reset_err:
Expand All @@ -664,11 +656,11 @@ static int wm9712_soc_remove(struct snd_soc_codec *codec)
static struct snd_soc_codec_driver soc_codec_dev_wm9712 = {
.probe = wm9712_soc_probe,
.remove = wm9712_soc_remove,
.suspend = wm9712_soc_suspend,
.resume = wm9712_soc_resume,
.read = ac97_read,
.write = ac97_write,
.set_bias_level = wm9712_set_bias_level,
.suspend_bias_off = true,
.reg_cache_size = ARRAY_SIZE(wm9712_reg),
.reg_word_size = sizeof(u16),
.reg_cache_step = 2,
Expand Down

0 comments on commit ab492b8

Please sign in to comment.