Skip to content

Commit

Permalink
ASoC: TWL4030: Remove wrapper for power down
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Ujfalusi authored and Liam Girdwood committed May 31, 2010
1 parent 33f92ed commit cbd2db1
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions sound/soc/codecs/twl4030.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit cbd2db1

Please sign in to comment.