]> Pileus Git - ~andy/linux/commitdiff
ASoC: Rely on core enabling the wm8994 with runtime PM
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Dec 2011 15:17:36 +0000 (15:17 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 8 Dec 2011 01:22:48 +0000 (09:22 +0800)
No need to do this in the driver now.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8994.c

index 02ca2573214d3e05d4c27c90233ded58b6c9faa8..3eaf56a33964f33623e1ec488e1c4d9a16daa83a 100644 (file)
@@ -2188,8 +2188,6 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
 
        case SND_SOC_BIAS_STANDBY:
                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
-                       pm_runtime_get_sync(codec->dev);
-
                        switch (control->type) {
                        case WM8994:
                                if (wm8994->revision < 4) {
@@ -2256,11 +2254,8 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        case SND_SOC_BIAS_OFF:
-               if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
+               if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY)
                        wm8994->cur_fw = NULL;
-
-                       pm_runtime_put(codec->dev);
-               }
                break;
        }
        codec->dapm.bias_level = level;