diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2010-05-26 04:38:15 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-05-31 06:08:58 -0400 |
commit | cbd2db128f2cbec1a70aa6897cc4cddbbadecbf6 (patch) | |
tree | a1b5c06b47b3c9dfc7cda8d567db6c2fbc7cd578 /sound/soc/codecs/twl4030.c | |
parent | 33f92ed4b3b9bef2080032b2b5d5dfba189eabeb (diff) |
ASoC: TWL4030: Remove wrapper for power down
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>
Diffstat (limited to 'sound/soc/codecs/twl4030.c')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 9a3e999b595c..1e0aba5b2c5d 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -319,15 +319,6 @@ static void twl4030_power_up(struct snd_soc_codec *codec) | |||
319 | twl4030_codec_enable(codec, 1); | 319 | twl4030_codec_enable(codec, 1); |
320 | } | 320 | } |
321 | 321 | ||
322 | /* | ||
323 | * Unconditional power down | ||
324 | */ | ||
325 | static void twl4030_power_down(struct snd_soc_codec *codec) | ||
326 | { | ||
327 | /* power down */ | ||
328 | twl4030_codec_enable(codec, 0); | ||
329 | } | ||
330 | |||
331 | /* Earpiece */ | 322 | /* Earpiece */ |
332 | static const struct snd_kcontrol_new twl4030_dapm_earpiece_controls[] = { | 323 | static const struct snd_kcontrol_new twl4030_dapm_earpiece_controls[] = { |
333 | SOC_DAPM_SINGLE("Voice", TWL4030_REG_EAR_CTL, 0, 1, 0), | 324 | 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, | |||
1607 | twl4030_power_up(codec); | 1598 | twl4030_power_up(codec); |
1608 | break; | 1599 | break; |
1609 | case SND_SOC_BIAS_OFF: | 1600 | case SND_SOC_BIAS_OFF: |
1610 | twl4030_power_down(codec); | 1601 | twl4030_codec_enable(codec, 0); |
1611 | break; | 1602 | break; |
1612 | } | 1603 | } |
1613 | codec->bias_level = level; | 1604 | codec->bias_level = level; |
@@ -2321,7 +2312,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev) | |||
2321 | return 0; | 2312 | return 0; |
2322 | 2313 | ||
2323 | error_codec: | 2314 | error_codec: |
2324 | twl4030_power_down(codec); | 2315 | twl4030_codec_enable(codec, 0); |
2325 | kfree(codec->reg_cache); | 2316 | kfree(codec->reg_cache); |
2326 | error_cache: | 2317 | error_cache: |
2327 | kfree(twl4030); | 2318 | kfree(twl4030); |