ASoC: TWL4030: Remove wrapper for power down
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>
Wed, 26 May 2010 08:38:15 +0000 (11:38 +0300)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 31 May 2010 10:08:58 +0000 (11:08 +0100)
There is no need for the power down wrapper.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/codecs/twl4030.c

index 9a3e999b595c091589f165b9dd548e6e436ece14..1e0aba5b2c5da3ba4bcb6a9f8f4ee41d5c582145 100644 (file)
@@ -319,15 +319,6 @@ static void twl4030_power_up(struct snd_soc_codec *codec)
        twl4030_codec_enable(codec, 1);
 }
 
-/*
- * Unconditional power down
- */
-static void twl4030_power_down(struct snd_soc_codec *codec)
-{
-       /* power down */
-       twl4030_codec_enable(codec, 0);
-}
-
 /* Earpiece */
 static const struct snd_kcontrol_new twl4030_dapm_earpiece_controls[] = {
        SOC_DAPM_SINGLE("Voice", TWL4030_REG_EAR_CTL, 0, 1, 0),
@@ -1607,7 +1598,7 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec,
                        twl4030_power_up(codec);
                break;
        case SND_SOC_BIAS_OFF:
-               twl4030_power_down(codec);
+               twl4030_codec_enable(codec, 0);
                break;
        }
        codec->bias_level = level;
@@ -2321,7 +2312,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
        return 0;
 
 error_codec:
-       twl4030_power_down(codec);
+       twl4030_codec_enable(codec, 0);
        kfree(codec->reg_cache);
 error_cache:
        kfree(twl4030);