diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-10-20 10:56:34 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-22 12:30:03 +0200 |
| commit | a8669f60321c8cb08af76438727b6460d1b591b6 (patch) | |
| tree | c5380f60158c7d12c09ebdd0cf415936f9d75b98 /sound/soc/codecs/max98095.c | |
| parent | Linux 3.18-rc1 (diff) | |
| download | linux-a8669f60321c8cb08af76438727b6460d1b591b6.tar.xz linux-a8669f60321c8cb08af76438727b6460d1b591b6.zip | |
ASoC: max98095: Cleanup manual bias level transitions
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/max98095.c')
| -rw-r--r-- | sound/soc/codecs/max98095.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 0ee6797d5083..42103cafeb24 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -2317,9 +2317,6 @@ static int max98095_probe(struct snd_soc_codec *codec) snd_soc_write(codec, M98095_097_PWR_SYS, M98095_PWRSV); - /* initialize registers cache to hardware default */ - max98095_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - snd_soc_write(codec, M98095_048_MIX_DAC_LR, M98095_DAI1L_TO_DACL|M98095_DAI1R_TO_DACR); @@ -2359,8 +2356,6 @@ static int max98095_remove(struct snd_soc_codec *codec) struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); struct i2c_client *client = to_i2c_client(codec->dev); - max98095_set_bias_level(codec, SND_SOC_BIAS_OFF); - if (max98095->headphone_jack || max98095->mic_jack) max98095_jack_detect_disable(codec); |