ASoC: Remove unneeded suspend bias managment from CODEC drivers

[safe/jmp/linux-2.6] / sound / soc / codecs / wm8711.c

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 1a7fca7..5acd35b 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -19,11 +19,13 @@
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
+#include <linux/spi/spi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
+#include <sound/tlv.h>
 #include <sound/initval.h>
 
 #include "wm8711.h"
@@ -50,31 +52,17 @@ static const u16 wm8711_reg[WM8711_CACHEREGNUM] = {
 
 #define wm8711_reset(c)        snd_soc_write(c, WM8711_RESET, 0)
 
+static const DECLARE_TLV_DB_SCALE(out_tlv, -12100, 100, 1);
+
 static const struct snd_kcontrol_new wm8711_snd_controls[] = {
 
-SOC_DOUBLE_R("Master Playback Volume", WM8711_LOUT1V, WM8711_ROUT1V,
-       0, 127, 0),
+SOC_DOUBLE_R_TLV("Master Playback Volume", WM8711_LOUT1V, WM8711_ROUT1V,
+                0, 127, 0, out_tlv),
 SOC_DOUBLE_R("Master Playback ZC Switch", WM8711_LOUT1V, WM8711_ROUT1V,
        7, 1, 0),
 
 };
 
-/* add non dapm controls */
-static int wm8711_add_controls(struct snd_soc_codec *codec)
-{
-       int err, i;
-
-       for (i = 0; i < ARRAY_SIZE(wm8711_snd_controls); i++) {
-               err = snd_ctl_add(codec->card,
-                               snd_soc_cnew(&wm8711_snd_controls[i], codec,
-                                       NULL));
-               if (err < 0)
-                       return err;
-       }
-
-       return 0;
-}
-
 /* Output Mixer */
 static const struct snd_kcontrol_new wm8711_output_mixer_controls[] = {
 SOC_DAPM_SINGLE("Line Bypass Switch", WM8711_APANA, 3, 1, 0),
@@ -111,7 +99,6 @@ static int wm8711_add_widgets(struct snd_soc_codec *codec)
 
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
 
-       snd_soc_dapm_new_widgets(codec);
        return 0;
 }
 
@@ -175,7 +162,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream,
        struct snd_soc_dai *dai)
 {
        struct snd_soc_codec *codec = dai->codec;
-       struct wm8711_priv *wm8711 = codec->private_data;
+       struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
        u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc;
        int i = get_coeff(wm8711->sysclk, params_rate(params));
        u16 srate = (coeff_div[i].sr << 2) |
@@ -239,7 +226,7 @@ static int wm8711_set_dai_sysclk(struct snd_soc_dai *codec_dai,
                int clk_id, unsigned int freq, int dir)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
-       struct wm8711_priv *wm8711 = codec->private_data;
+       struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
 
        switch (freq) {
        case 11289600:
@@ -336,11 +323,7 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-#define WM8711_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
-               SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
-               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\
-               SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\
-               SNDRV_PCM_RATE_96000)
+#define WM8711_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8711_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
        SNDRV_PCM_FMTBIT_S24_LE)
@@ -361,7 +344,8 @@ struct snd_soc_dai wm8711_dai = {
                .channels_min = 1,
                .channels_max = 2,
                .rates = WM8711_RATES,
-               .formats = WM8711_FORMATS,},
+               .formats = WM8711_FORMATS,
+       },
        .ops = &wm8711_ops,
 };
 EXPORT_SYMBOL_GPL(wm8711_dai);
@@ -391,7 +375,7 @@ static int wm8711_resume(struct platform_device *pdev)
                codec->hw_write(codec->control_data, data, 2);
        }
        wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-       wm8711_set_bias_level(codec, codec->suspend_bias_level);
+
        return 0;
 }
 
@@ -419,17 +403,9 @@ static int wm8711_probe(struct platform_device *pdev)
        snd_soc_add_controls(codec, wm8711_snd_controls,
                             ARRAY_SIZE(wm8711_snd_controls));
        wm8711_add_widgets(codec);
-       ret = snd_soc_init_card(socdev);
-       if (ret < 0) {
-               dev_err(codec->dev, "failed to register card: %d\n", ret);
-               goto card_err;
-       }
 
        return ret;
 
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }
@@ -469,7 +445,7 @@ static int wm8711_register(struct wm8711_priv *wm8711,
        INIT_LIST_HEAD(&codec->dapm_widgets);
        INIT_LIST_HEAD(&codec->dapm_paths);
 
-       codec->private_data = wm8711;
+       snd_soc_codec_set_drvdata(codec, wm8711);
        codec->name = "WM8711";
        codec->owner = THIS_MODULE;
        codec->bias_level = SND_SOC_BIAS_OFF;
@@ -563,21 +539,6 @@ static int __devexit wm8711_spi_remove(struct spi_device *spi)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int wm8711_spi_suspend(struct spi_device *spi, pm_message_t msg)
-{
-       return snd_soc_suspend_device(&spi->dev);
-}
-
-static int wm8711_spi_resume(struct spi_device *spi)
-{
-       return snd_soc_resume_device(&spi->dev);
-}
-#else
-#define wm8711_spi_suspend NULL
-#define wm8711_spi_resume NULL
-#endif
-
 static struct spi_driver wm8711_spi_driver = {
        .driver = {
                .name   = "wm8711",
@@ -585,8 +546,6 @@ static struct spi_driver wm8711_spi_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = wm8711_spi_probe,
-       .suspend        = wm8711_spi_suspend,
-       .resume         = wm8711_spi_resume,
        .remove         = __devexit_p(wm8711_spi_remove),
 };
 #endif /* CONFIG_SPI_MASTER */
@@ -648,9 +607,9 @@ static int __init wm8711_modinit(void)
        }
 #endif
 #if defined(CONFIG_SPI_MASTER)
-       ret = spi_register_driver(&wm8731_spi_driver);
+       ret = spi_register_driver(&wm8711_spi_driver);
        if (ret != 0) {
-               printk(KERN_ERR "Failed to register WM8731 SPI driver: %d\n",
+               printk(KERN_ERR "Failed to register WM8711 SPI driver: %d\n",
                       ret);
        }
 #endif
@@ -664,7 +623,7 @@ static void __exit wm8711_exit(void)
        i2c_del_driver(&wm8711_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)
-       spi_unregister_driver(&wm8731_spi_driver);
+       spi_unregister_driver(&wm8711_spi_driver);
 #endif
 }
 module_exit(wm8711_exit);