[PATCH] ASoC: Remove word "Switch" from Handsfree switch name

[PATCH] ASoC: Remove word "Switch" from Handsfree switch name

[Lopez Cruz, Misael]

SoC dapm adds the suffix "Switch" to SND_SOC_DAPM_SWITCH controls,
removing word "Switch" from HandsfreeL/HandsfreeR widget name
for avoiding to duplicate it.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
---
 sound/soc/codecs/twl4030.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index df42fa2..49ceb62 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1258,14 +1258,14 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
 	/* HandsfreeL/R */
 	SND_SOC_DAPM_MUX("HandsfreeL Mux", SND_SOC_NOPM, 0, 0,
 		&twl4030_dapm_handsfreel_control),
-	SND_SOC_DAPM_SWITCH("HandsfreeL Switch", SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SWITCH("HandsfreeL", SND_SOC_NOPM, 0, 0,
 			&twl4030_dapm_handsfreelmute_control),
 	SND_SOC_DAPM_PGA_E("HandsfreeL PGA", SND_SOC_NOPM,
 			0, 0, NULL, 0, handsfreelpga_event,
 			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),
 	SND_SOC_DAPM_MUX("HandsfreeR Mux", SND_SOC_NOPM, 5, 0,
 		&twl4030_dapm_handsfreer_control),
-	SND_SOC_DAPM_SWITCH("HandsfreeR Switch", SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SWITCH("HandsfreeR", SND_SOC_NOPM, 0, 0,
 			&twl4030_dapm_handsfreermute_control),
 	SND_SOC_DAPM_PGA_E("HandsfreeR PGA", SND_SOC_NOPM,
 			0, 0, NULL, 0, handsfreerpga_event,
@@ -1377,15 +1377,15 @@ static const struct snd_soc_dapm_route intercon[] = {
 	{"HandsfreeL Mux", "AudioL1", "Analog L1 Playback Mixer"},
 	{"HandsfreeL Mux", "AudioL2", "Analog L2 Playback Mixer"},
 	{"HandsfreeL Mux", "AudioR2", "Analog R2 Playback Mixer"},
-	{"HandsfreeL Switch", "Switch", "HandsfreeL Mux"},
-	{"HandsfreeL PGA", NULL, "HandsfreeL Switch"},
+	{"HandsfreeL", "Switch", "HandsfreeL Mux"},
+	{"HandsfreeL PGA", NULL, "HandsfreeL"},
 	/* HandsfreeR */
 	{"HandsfreeR Mux", "Voice", "Analog Voice Playback Mixer"},
 	{"HandsfreeR Mux", "AudioR1", "Analog R1 Playback Mixer"},
 	{"HandsfreeR Mux", "AudioR2", "Analog R2 Playback Mixer"},
 	{"HandsfreeR Mux", "AudioL2", "Analog L2 Playback Mixer"},
-	{"HandsfreeR Switch", "Switch", "HandsfreeR Mux"},
-	{"HandsfreeR PGA", NULL, "HandsfreeR Switch"},
+	{"HandsfreeR", "Switch", "HandsfreeR Mux"},
+	{"HandsfreeR PGA", NULL, "HandsfreeR"},
 	/* Vibra */
 	{"Vibra Mux", "AudioL1", "DAC Left1"},
 	{"Vibra Mux", "AudioR1", "DAC Right1"},
-- 
1.5.4.3

Re: [PATCH] ASoC: Remove word "Switch" from Handsfree switch name

[Peter Ujfalusi]

On Thursday 25 June 2009 20:36:14 ext Lopez Cruz, Misael wrote:
> SoC dapm adds the suffix "Switch" to SND_SOC_DAPM_SWITCH controls,
> removing word "Switch" from HandsfreeL/HandsfreeR widget name
> for avoiding to duplicate it.
>
> Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
> ---
>  sound/soc/codecs/twl4030.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)

Can you add the TWL4030 to the patch name in the future? It is much easier to 
spot it in that way.

Thank you!

Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

Re: [PATCH] ASoC: Remove word "Switch" from Handsfree switch name

[Mark Brown]

On Fri, Jun 26, 2009 at 09:07:07AM +0300, Peter Ujfalusi wrote:
> On Thursday 25 June 2009 20:36:14 ext Lopez Cruz, Misael wrote:

> > SoC dapm adds the suffix "Switch" to SND_SOC_DAPM_SWITCH controls,
> > removing word "Switch" from HandsfreeL/HandsfreeR widget name
> > for avoiding to duplicate it.

> Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>

Applied, thanks.

Re: [PATCH] ASoC: Remove word "Switch" from Handsfree switch name

[Lopez Cruz, Misael]

> On Thursday 25 June 2009 20:36:14 ext Lopez Cruz, Misael wrote:
> > SoC dapm adds the suffix "Switch" to SND_SOC_DAPM_SWITCH controls, 
> > removing word "Switch" from HandsfreeL/HandsfreeR widget name for 
> > avoiding to duplicate it.
> >
> > Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
> > ---
> >  sound/soc/codecs/twl4030.c |   12 ++++++------
> >  1 files changed, 6 insertions(+), 6 deletions(-)

> Can you add the TWL4030 to the patch name in the future? It 
> is much easier to spot it in that way.

I'm sorry I forgot it. I'll take care of that next time.

> Thank you!
> Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>