diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 06:06:46 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 06:06:46 -0500 |
commit | b363bcaf1df2e8b6ab7c0dbfdc5bd8f275f08a96 (patch) | |
tree | 76f77dcfa28f5ff5afd72cefc9da2027fa30c515 | |
parent | 315472d5abca4d4db90ba654fd616b9a694c80cf (diff) | |
parent | f4d8ada2a0d4634d6b334ec85328f04c2d01fc98 (diff) |
Merge remote-tracking branch 'asoc/topic/tlv320dac33' into asoc-next
-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 782b0cded2e6..4f358393d6d6 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) | |||
1452 | return 0; | 1452 | return 0; |
1453 | } | 1453 | } |
1454 | 1454 | ||
1455 | static int dac33_soc_suspend(struct snd_soc_codec *codec) | ||
1456 | { | ||
1457 | dac33_set_bias_level(codec, SND_SOC_BIAS_OFF); | ||
1458 | |||
1459 | return 0; | ||
1460 | } | ||
1461 | |||
1462 | static int dac33_soc_resume(struct snd_soc_codec *codec) | ||
1463 | { | ||
1464 | dac33_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | ||
1465 | |||
1466 | return 0; | ||
1467 | } | ||
1468 | |||
1469 | static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { | 1455 | static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { |
1470 | .read = dac33_read_reg_cache, | 1456 | .read = dac33_read_reg_cache, |
1471 | .write = dac33_write_locked, | 1457 | .write = dac33_write_locked, |
@@ -1476,8 +1462,6 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320dac33 = { | |||
1476 | .reg_cache_default = dac33_reg, | 1462 | .reg_cache_default = dac33_reg, |
1477 | .probe = dac33_soc_probe, | 1463 | .probe = dac33_soc_probe, |
1478 | .remove = dac33_soc_remove, | 1464 | .remove = dac33_soc_remove, |
1479 | .suspend = dac33_soc_suspend, | ||
1480 | .resume = dac33_soc_resume, | ||
1481 | 1465 | ||
1482 | .controls = dac33_snd_controls, | 1466 | .controls = dac33_snd_controls, |
1483 | .num_controls = ARRAY_SIZE(dac33_snd_controls), | 1467 | .num_controls = ARRAY_SIZE(dac33_snd_controls), |