From c25f3bc980d3fbe29ae4f15b9389d2a464715888 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 12 Jan 2010 14:01:19 +0000
Subject: [PATCH] --- yaml --- r: 182818 b: refs/heads/master c:
 03e7a35c0ef7a462385fb6a301dfc1b287cac6de h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/codecs/ad1836.c | 32 --------------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/[refs] b/[refs]
index 963ecc8c43ce..936974305764 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 163849ea9b4c5d50fbd324692461983d18faadad
+refs/heads/master: 03e7a35c0ef7a462385fb6a301dfc1b287cac6de
diff --git a/trunk/sound/soc/codecs/ad1836.c b/trunk/sound/soc/codecs/ad1836.c
index 83add2f3afba..2c18e3d1b71e 100644
--- a/trunk/sound/soc/codecs/ad1836.c
+++ b/trunk/sound/soc/codecs/ad1836.c
@@ -223,36 +223,6 @@ static unsigned int ad1836_read_reg_cache(struct snd_soc_codec *codec,
 	return reg_cache[reg];
 }
 
-#ifdef CONFIG_PM
-static int ad1836_soc_suspend(struct platform_device *pdev,
-		pm_message_t state)
-{
-	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-	struct snd_soc_codec *codec = socdev->card->codec;
-
-	/* reset clock control mode */
-	u16 adc_ctrl2 =  codec->read(codec, AD1836_ADC_CTRL2);
-	adc_ctrl2 &= ~AD1836_ADC_SERFMT_MASK;
-
-	return codec->write(codec, AD1836_ADC_CTRL2, adc_ctrl2);
-}
-
-static int ad1836_soc_resume(struct platform_device *pdev)
-{
-	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-	struct snd_soc_codec *codec = socdev->card->codec;
-
-	/* restore clock control mode */
-	u16 adc_ctrl2 = codec->read(codec, AD1836_ADC_CTRL2);
-	adc_ctrl2 |= AD1836_ADC_AUX;
-
-	return codec->write(codec, AD1836_ADC_CTRL2, adc_ctrl2);
-}
-#else
-#define ad1836_soc_suspend NULL
-#define ad1836_soc_resume  NULL
-#endif
-
 static int __devinit ad1836_spi_probe(struct spi_device *spi)
 {
 	struct snd_soc_codec *codec;
@@ -434,8 +404,6 @@ static int ad1836_remove(struct platform_device *pdev)
 struct snd_soc_codec_device soc_codec_dev_ad1836 = {
 	.probe = 	ad1836_probe,
 	.remove = 	ad1836_remove,
-	.suspend =      ad1836_soc_suspend,
-	.resume =       ad1836_soc_resume,
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_ad1836);