[alsa-devel] [PATCH] Kill truncate warning by shortening Sigmatel-specific AC97 control name

[Andreas Mohr]

Hi,

ChangeLog:

Avoid
ALSA sound/core/control.c:232: Control name 'Sigmatel Surround Phase Inversion Playback Switch' truncated
 to 'Sigmatel Surround Phase Inversion Playback '
bootup message by omitting weird Sigmatel prefix in this case; also fix
up the related ca0106 mixer control removal part by using identical naming
there.


Patch runtime-tested on -rc6, then diffed, run through checkpatch.pl
and readjusted accordingly.

I guess that this is more or less what one should have done after your
very fast reply...

BTW, the "3D Control Sigmatel - Depth" vs. "3D Control - Switch" is even
weirder naming, methinks.

Thanks!!

Signed-off-by: Andreas Mohr <andi at lisas.de>


diff -uprN linux-2.6.30-rc6.orig/sound/pci/ac97/ac97_patch.c linux-2.6.30-rc6.patched/sound/pci/ac97/ac97_patch.c
--- linux-2.6.30-rc6.orig/sound/pci/ac97/ac97_patch.c	2009-05-22 17:26:44.000000000 +0200
+++ linux-2.6.30-rc6.patched/sound/pci/ac97/ac97_patch.c	2009-05-22 17:35:20.000000000 +0200
@@ -958,10 +958,13 @@ static int patch_sigmatel_stac9708_3d(st
 }
 
 static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker =
-AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);
+AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch",
+		AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);
 
+/* "Sigmatel " removed due to excessive name length: */
 static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert =
-AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);
+AC97_SINGLE("Surround Phase Inversion Playback Switch",
+		AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);
 
 static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {
 AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),
diff -uprN linux-2.6.30-rc6.orig/sound/pci/ca0106/ca0106_mixer.c linux-2.6.30-rc6.patched/sound/pci/ca0106/ca0106_mixer.c
--- linux-2.6.30-rc6.orig/sound/pci/ca0106/ca0106_mixer.c	2009-05-22 17:26:59.000000000 +0200
+++ linux-2.6.30-rc6.patched/sound/pci/ca0106/ca0106_mixer.c	2009-05-22 17:11:57.000000000 +0200
@@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct sn
 		"Capture Volume",
 		"External Amplifier",
 		"Sigmatel 4-Speaker Stereo Playback Switch",
-		"Sigmatel Surround Phase Inversion Playback ",
+		"Surround Phase Inversion Playback Switch",
 		NULL
 	};
 	static char *ca0106_rename_ctls[] = {