From d77a14b579f6bfe2d149d3bcc5bd306e20d2d652 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Mon, 19 May 2014 16:17:27 +0300 Subject: ASoC: Remove needless snd_soc_dapm_enable_pin() from machine driver inits ALSA SoC core marks widgets as connected by default when they are initialized in snd_soc_dapm_new_control() so there is no need to call snd_soc_dapm_enable_pin() from machine driver init functions. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown --- sound/soc/pxa/brownstone.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'sound/soc/pxa/brownstone.c') diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index 9c128d4c8cbf..c8dd53f9c35d 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c @@ -50,11 +50,6 @@ static int brownstone_wm8994_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; - snd_soc_dapm_enable_pin(dapm, "Ext Spk"); - snd_soc_dapm_enable_pin(dapm, "Headset Stereophone"); - snd_soc_dapm_enable_pin(dapm, "Headset Mic"); - snd_soc_dapm_enable_pin(dapm, "Main Mic"); - /* set endpoints to not connected */ snd_soc_dapm_nc_pin(dapm, "HPOUT2P"); snd_soc_dapm_nc_pin(dapm, "HPOUT2N"); -- cgit v1.2.3