Skip to content

Commit

Permalink
ASoC: wm8985: 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 and SND_SOC_BIAS_STANDBY in resume. This makes
the code a bit shorter and cleaner.

Since the ASoC core now takes care of setting the bias level to
SND_SOC_BIAS_OFF when removing the CODEC there is no need to do it manually
anymore either.

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 5d01410 commit a5dde8c
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions sound/soc/codecs/wm8985.c
Original file line number Diff line number Diff line change
Expand Up @@ -961,29 +961,6 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec,
return 0;
}

#ifdef CONFIG_PM
static int wm8985_suspend(struct snd_soc_codec *codec)
{
wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}

static int wm8985_resume(struct snd_soc_codec *codec)
{
wm8985_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;
}
#else
#define wm8985_suspend NULL
#define wm8985_resume NULL
#endif

static int wm8985_remove(struct snd_soc_codec *codec)
{
wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}

static int wm8985_probe(struct snd_soc_codec *codec)
{
size_t i;
Expand Down Expand Up @@ -1023,7 +1000,6 @@ static int wm8985_probe(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, WM8985_BIAS_CTRL, WM8985_BIASCUT,
WM8985_BIASCUT);

wm8985_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
return 0;

err_reg_enable:
Expand Down Expand Up @@ -1064,10 +1040,8 @@ static struct snd_soc_dai_driver wm8985_dai = {

static struct snd_soc_codec_driver soc_codec_dev_wm8985 = {
.probe = wm8985_probe,
.remove = wm8985_remove,
.suspend = wm8985_suspend,
.resume = wm8985_resume,
.set_bias_level = wm8985_set_bias_level,
.suspend_bias_off = true,

.controls = wm8985_snd_controls,
.num_controls = ARRAY_SIZE(wm8985_snd_controls),
Expand Down

0 comments on commit a5dde8c

Please sign in to comment.