ALSA: hda - Remove duplicated strings from codec name

Remove codec vendor names from the codec name strings.
The vendor name is already given from the vendor name table, so
displayed doubly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
index 5887b827bb3290b935bd9d0efb92a5465b36fd38..233e4778bba9dad5921cf0062ceff19f698f0a9b 100644 (file)
--- a/sound/pci/hda/patch_atihdmi.c
+++ b/sound/pci/hda/patch_atihdmi.c
@@ -187,10 +187,10 @@ static int patch_atihdmi(struct hda_codec *codec)
  * patch entries
  */
 static struct hda_codec_preset snd_hda_preset_atihdmi[] = {
-       { .id = 0x1002793c, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
-       { .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
-       { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi },
-       { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi },
+       { .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },
+       { .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },
+       { .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },
+       { .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi },
        { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi },
        { .id = 0x17e80047, .name = "Chrontel HDMI",  .patch = patch_atihdmi },
        {} /* terminator */

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 6e4d01d1d502ff9d37a3301668482217c74fdd8a..c761394cbe84baabf9433c0bdd3c1d928f79f08c 100644 (file)
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -3249,73 +3249,73 @@ static int patch_vt1702(struct hda_codec *codec)
  * patch entries
  */
 static struct hda_codec_preset snd_hda_preset_via[] = {
-       { .id = 0x11061708, .name = "VIA VT1708", .patch = patch_vt1708},
-       { .id = 0x11061709, .name = "VIA VT1708", .patch = patch_vt1708},
-       { .id = 0x1106170A, .name = "VIA VT1708", .patch = patch_vt1708},
-       { .id = 0x1106170B, .name = "VIA VT1708", .patch = patch_vt1708},
-       { .id = 0x1106E710, .name = "VIA VT1709 10-Ch",
+       { .id = 0x11061708, .name = "VT1708", .patch = patch_vt1708},
+       { .id = 0x11061709, .name = "VT1708", .patch = patch_vt1708},
+       { .id = 0x1106170a, .name = "VT1708", .patch = patch_vt1708},
+       { .id = 0x1106170b, .name = "VT1708", .patch = patch_vt1708},
+       { .id = 0x1106e710, .name = "VT1709 10-Ch",
          .patch = patch_vt1709_10ch},
-       { .id = 0x1106E711, .name = "VIA VT1709 10-Ch",
+       { .id = 0x1106e711, .name = "VT1709 10-Ch",
          .patch = patch_vt1709_10ch},
-       { .id = 0x1106E712, .name = "VIA VT1709 10-Ch",
+       { .id = 0x1106e712, .name = "VT1709 10-Ch",
          .patch = patch_vt1709_10ch},
-       { .id = 0x1106E713, .name = "VIA VT1709 10-Ch",
+       { .id = 0x1106e713, .name = "VT1709 10-Ch",
          .patch = patch_vt1709_10ch},
-       { .id = 0x1106E714, .name = "VIA VT1709 6-Ch",
+       { .id = 0x1106e714, .name = "VT1709 6-Ch",
          .patch = patch_vt1709_6ch},
-       { .id = 0x1106E715, .name = "VIA VT1709 6-Ch",
+       { .id = 0x1106e715, .name = "VT1709 6-Ch",
          .patch = patch_vt1709_6ch},
-       { .id = 0x1106E716, .name = "VIA VT1709 6-Ch",
+       { .id = 0x1106e716, .name = "VT1709 6-Ch",
          .patch = patch_vt1709_6ch},
-       { .id = 0x1106E717, .name = "VIA VT1709 6-Ch",
+       { .id = 0x1106e717, .name = "VT1709 6-Ch",
          .patch = patch_vt1709_6ch},
-       { .id = 0x1106E720, .name = "VIA VT1708B 8-Ch",
+       { .id = 0x1106e720, .name = "VT1708B 8-Ch",
          .patch = patch_vt1708B_8ch},
-       { .id = 0x1106E721, .name = "VIA VT1708B 8-Ch",
+       { .id = 0x1106e721, .name = "VT1708B 8-Ch",
          .patch = patch_vt1708B_8ch},
-       { .id = 0x1106E722, .name = "VIA VT1708B 8-Ch",
+       { .id = 0x1106e722, .name = "VT1708B 8-Ch",
          .patch = patch_vt1708B_8ch},
-       { .id = 0x1106E723, .name = "VIA VT1708B 8-Ch",
+       { .id = 0x1106e723, .name = "VT1708B 8-Ch",
          .patch = patch_vt1708B_8ch},
-       { .id = 0x1106E724, .name = "VIA VT1708B 4-Ch",
+       { .id = 0x1106e724, .name = "VT1708B 4-Ch",
          .patch = patch_vt1708B_4ch},
-       { .id = 0x1106E725, .name = "VIA VT1708B 4-Ch",
+       { .id = 0x1106e725, .name = "VT1708B 4-Ch",
          .patch = patch_vt1708B_4ch},
-       { .id = 0x1106E726, .name = "VIA VT1708B 4-Ch",
+       { .id = 0x1106e726, .name = "VT1708B 4-Ch",
          .patch = patch_vt1708B_4ch},
-       { .id = 0x1106E727, .name = "VIA VT1708B 4-Ch",
+       { .id = 0x1106e727, .name = "VT1708B 4-Ch",
          .patch = patch_vt1708B_4ch},
-       { .id = 0x11060397, .name = "VIA VT1708S",
+       { .id = 0x11060397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11061397, .name = "VIA VT1708S",
+       { .id = 0x11061397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11062397, .name = "VIA VT1708S",
+       { .id = 0x11062397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11063397, .name = "VIA VT1708S",
+       { .id = 0x11063397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11064397, .name = "VIA VT1708S",
+       { .id = 0x11064397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11065397, .name = "VIA VT1708S",
+       { .id = 0x11065397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11066397, .name = "VIA VT1708S",
+       { .id = 0x11066397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11067397, .name = "VIA VT1708S",
+       { .id = 0x11067397, .name = "VT1708S",
          .patch = patch_vt1708S},
-       { .id = 0x11060398, .name = "VIA VT1702",
+       { .id = 0x11060398, .name = "VT1702",
          .patch = patch_vt1702},
-       { .id = 0x11061398, .name = "VIA VT1702",
+       { .id = 0x11061398, .name = "VT1702",
          .patch = patch_vt1702},
-       { .id = 0x11062398, .name = "VIA VT1702",
+       { .id = 0x11062398, .name = "VT1702",
          .patch = patch_vt1702},
-       { .id = 0x11063398, .name = "VIA VT1702",
+       { .id = 0x11063398, .name = "VT1702",
          .patch = patch_vt1702},
-       { .id = 0x11064398, .name = "VIA VT1702",
+       { .id = 0x11064398, .name = "VT1702",
          .patch = patch_vt1702},
-       { .id = 0x11065398, .name = "VIA VT1702",
+       { .id = 0x11065398, .name = "VT1702",
          .patch = patch_vt1702},
-       { .id = 0x11066398, .name = "VIA VT1702",
+       { .id = 0x11066398, .name = "VT1702",
          .patch = patch_vt1702},
-       { .id = 0x11067398, .name = "VIA VT1702",
+       { .id = 0x11067398, .name = "VT1702",
          .patch = patch_vt1702},
        {} /* terminator */
 };