diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:46 +0000 |
| commit | b363bcaf1df2e8b6ab7c0dbfdc5bd8f275f08a96 (patch) | |
| tree | 76f77dcfa28f5ff5afd72cefc9da2027fa30c515 /sound | |
| parent | 315472d5abca4d4db90ba654fd616b9a694c80cf (diff) | |
| parent | f4d8ada2a0d4634d6b334ec85328f04c2d01fc98 (diff) | |
| download | linux-3.10-b363bcaf1df2e8b6ab7c0dbfdc5bd8f275f08a96.tar.gz linux-3.10-b363bcaf1df2e8b6ab7c0dbfdc5bd8f275f08a96.tar.bz2 linux-3.10-b363bcaf1df2e8b6ab7c0dbfdc5bd8f275f08a96.zip | |
Merge remote-tracking branch 'asoc/topic/tlv320dac33' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/tlv320dac33.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 782b0cded2e..4f358393d6d 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -1452,20 +1452,6 @@ static int dac33_soc_remove(struct snd_soc_codec *codec) return 0; } -static int dac33_soc_suspend(struct snd_soc_codec *codec) -{ - dac33_set_bias_level(codec, SND_SOC_BIAS_OFF); - - return 0; -} - -static int dac33_soc_resume(struct snd_soc_codec *codec) -{ - dac33_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - - return 0; -} - static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { .read = dac33_read_reg_cache, .write = dac33_write_locked, @@ -1476,8 +1462,6 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { .reg_cache_default = dac33_reg, .probe = dac33_soc_probe, .remove = dac33_soc_remove, - .suspend = dac33_soc_suspend, - .resume = dac33_soc_resume, .controls = dac33_snd_controls, .num_controls = ARRAY_SIZE(dac33_snd_controls), |