Skip to contentSkip to conversation

ASoC: ttc-dkb: Remove unnecessary snd_soc_dapm_disable_pin() calls

PATCH Applied Lars-Peter Clausen 2 participants 2 messages Jan 9, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: ttc-dkb: Remove unnecessary snd_soc_dapm_disable_pin() calls

The "Headset Mic 2" and the "Headset Stereophone" widget are managed by the jack detection logic. Their will be set depending on whether something is connected to the jack or not. There is no need to manually change the state beforehand as it will be overwritten anyway.

---
 sound/soc/pxa/ttc-dkb.c | 4 ----
 1 file changed, 4 deletions(-)
sound/soc/pxa/ttc-dkb.c +0 -4
index e3d7257a..5001dbb 100644
@@ -76,10 +76,6 @@ static const struct snd_soc_dapm_route ttc_audio_map[] = {
 static int ttc_pm860x_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_disable_pin(dapm, "Headset Mic 2");
-	snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
 
 	/* Headset jack detection */
 	snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE
Signature · 1 line
1.8.0
maintainer Applied
#1 lore raw
Quoted 4 lines · Lars-Peter Clausen

The "Headset Mic 2" and the "Headset Stereophone" widget are managed by the jack detection logic. Their will be set depending on whether something is connected to the jack or not. There is no need to manually change the state beforehand as it will be overwritten anyway.

Applied, thanks.