Merge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552', 'asoc...

[cascardo/linux.git] / sound / soc / codecs / tlv320aic3x.c

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 5e8626a..f7c2a57 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1235,20 +1235,6 @@ static struct snd_soc_dai_driver aic3x_dai = {
        .symmetric_rates = 1,
 };
 
-static int aic3x_suspend(struct snd_soc_codec *codec)
-{
-       aic3x_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-       return 0;
-}
-
-static int aic3x_resume(struct snd_soc_codec *codec)
-{
-       aic3x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-       return 0;
-}
-
 static void aic3x_mono_init(struct snd_soc_codec *codec)
 {
        /* DAC to Mono Line Out default volume and route to Output mixer */
@@ -1442,8 +1428,6 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = {
        .idle_bias_off = true,
        .probe = aic3x_probe,
        .remove = aic3x_remove,
-       .suspend = aic3x_suspend,
-       .resume = aic3x_resume,
        .controls = aic3x_snd_controls,
        .num_controls = ARRAY_SIZE(aic3x_snd_controls),
        .dapm_widgets = aic3x_dapm_widgets,