Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbd2db12 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Liam Girdwood
Browse files

ASoC: TWL4030: Remove wrapper for power down 



There is no need for the power down wrapper.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 33f92ed4

sound/soc/codecs/twl4030.c

+2 −11
Original line number Diff line number Diff line
@@ -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);