Merge remote-tracking branches 'asoc/topic/wm8991', 'asoc/topic/wm8993', 'asoc/topic...

[karo-tx-linux.git] / sound / soc / codecs / wm8400.c

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 72471bef2e9a592da98fbea3f3a5db08471d39a2..385894f6e26433fd3226a5374c038a30e7bb9a20 100644 (file)
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -58,12 +58,10 @@ static struct regulator_bulk_data power[] = {
 
 /* codec private data */
 struct wm8400_priv {
-       struct snd_soc_codec *codec;
        struct wm8400 *wm8400;
        u16 fake_register;
        unsigned int sysclk;
        unsigned int pcmclk;
-       struct work_struct work;
        int fll_in, fll_out;
 };
 
@@ -1278,30 +1276,6 @@ static struct snd_soc_dai_driver wm8400_dai = {
        .ops = &wm8400_dai_ops,
 };
 
-static int wm8400_suspend(struct snd_soc_codec *codec)
-{
-       wm8400_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-       return 0;
-}
-
-static int wm8400_resume(struct snd_soc_codec *codec)
-{
-       wm8400_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-       return 0;
-}
-
-static void wm8400_probe_deferred(struct work_struct *work)
-{
-       struct wm8400_priv *priv = container_of(work, struct wm8400_priv,
-                                               work);
-       struct snd_soc_codec *codec = priv->codec;
-
-       /* charge output caps */
-       wm8400_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-}
-
 static int wm8400_codec_probe(struct snd_soc_codec *codec)
 {
        struct wm8400 *wm8400 = dev_get_platdata(codec->dev);
@@ -1316,7 +1290,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
 
        snd_soc_codec_set_drvdata(codec, priv);
        priv->wm8400 = wm8400;
-       priv->codec = codec;
 
        ret = devm_regulator_bulk_get(wm8400->dev,
                                 ARRAY_SIZE(power), &power[0]);
@@ -1325,8 +1298,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
                return ret;
        }
 
-       INIT_WORK(&priv->work, wm8400_probe_deferred);
-
        wm8400_codec_reset(codec);
 
        reg = snd_soc_read(codec, WM8400_POWER_MANAGEMENT_1);
@@ -1343,8 +1314,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
        snd_soc_write(codec, WM8400_LEFT_OUTPUT_VOLUME, 0x50 | (1<<8));
        snd_soc_write(codec, WM8400_RIGHT_OUTPUT_VOLUME, 0x50 | (1<<8));
 
-       if (!schedule_work(&priv->work))
-               return -EINVAL;
        return 0;
 }
 
@@ -1369,10 +1338,9 @@ static struct regmap *wm8400_get_regmap(struct device *dev)
 static struct snd_soc_codec_driver soc_codec_dev_wm8400 = {
        .probe =        wm8400_codec_probe,
        .remove =       wm8400_codec_remove,
-       .suspend =      wm8400_suspend,
-       .resume =       wm8400_resume,
        .get_regmap =   wm8400_get_regmap,
        .set_bias_level = wm8400_set_bias_level,
+       .suspend_bias_off = true,
 
        .controls = wm8400_snd_controls,
        .num_controls = ARRAY_SIZE(wm8400_snd_controls),