diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-18 03:17:56 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-18 03:17:56 -0500 |
commit | 3218c178b41b420cb7e0d120c7a137a3969242e5 (patch) | |
tree | af43b3dd627381fcceb2475c315c8feec45a0f83 | |
parent | 74c611334ff131f2b87c7634314bde9e7fd98653 (diff) |
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>
-rw-r--r-- | sound/pci/hda/patch_atihdmi.c | 8 | ||||
-rw-r--r-- | sound/pci/hda/patch_via.c | 72 |
2 files changed, 40 insertions, 40 deletions
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c index 5887b827bb32..233e4778bba9 100644 --- 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) | |||
187 | * patch entries | 187 | * patch entries |
188 | */ | 188 | */ |
189 | static struct hda_codec_preset snd_hda_preset_atihdmi[] = { | 189 | static struct hda_codec_preset snd_hda_preset_atihdmi[] = { |
190 | { .id = 0x1002793c, .name = "ATI RS600 HDMI", .patch = patch_atihdmi }, | 190 | { .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi }, |
191 | { .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi }, | 191 | { .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi }, |
192 | { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi }, | 192 | { .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi }, |
193 | { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi }, | 193 | { .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi }, |
194 | { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi }, | 194 | { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi }, |
195 | { .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_atihdmi }, | 195 | { .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_atihdmi }, |
196 | {} /* terminator */ | 196 | {} /* terminator */ |
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 6e4d01d1d502..c761394cbe84 100644 --- 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) | |||
3249 | * patch entries | 3249 | * patch entries |
3250 | */ | 3250 | */ |
3251 | static struct hda_codec_preset snd_hda_preset_via[] = { | 3251 | static struct hda_codec_preset snd_hda_preset_via[] = { |
3252 | { .id = 0x11061708, .name = "VIA VT1708", .patch = patch_vt1708}, | 3252 | { .id = 0x11061708, .name = "VT1708", .patch = patch_vt1708}, |
3253 | { .id = 0x11061709, .name = "VIA VT1708", .patch = patch_vt1708}, | 3253 | { .id = 0x11061709, .name = "VT1708", .patch = patch_vt1708}, |
3254 | { .id = 0x1106170A, .name = "VIA VT1708", .patch = patch_vt1708}, | 3254 | { .id = 0x1106170a, .name = "VT1708", .patch = patch_vt1708}, |
3255 | { .id = 0x1106170B, .name = "VIA VT1708", .patch = patch_vt1708}, | 3255 | { .id = 0x1106170b, .name = "VT1708", .patch = patch_vt1708}, |
3256 | { .id = 0x1106E710, .name = "VIA VT1709 10-Ch", | 3256 | { .id = 0x1106e710, .name = "VT1709 10-Ch", |
3257 | .patch = patch_vt1709_10ch}, | 3257 | .patch = patch_vt1709_10ch}, |
3258 | { .id = 0x1106E711, .name = "VIA VT1709 10-Ch", | 3258 | { .id = 0x1106e711, .name = "VT1709 10-Ch", |
3259 | .patch = patch_vt1709_10ch}, | 3259 | .patch = patch_vt1709_10ch}, |
3260 | { .id = 0x1106E712, .name = "VIA VT1709 10-Ch", | 3260 | { .id = 0x1106e712, .name = "VT1709 10-Ch", |
3261 | .patch = patch_vt1709_10ch}, | 3261 | .patch = patch_vt1709_10ch}, |
3262 | { .id = 0x1106E713, .name = "VIA VT1709 10-Ch", | 3262 | { .id = 0x1106e713, .name = "VT1709 10-Ch", |
3263 | .patch = patch_vt1709_10ch}, | 3263 | .patch = patch_vt1709_10ch}, |
3264 | { .id = 0x1106E714, .name = "VIA VT1709 6-Ch", | 3264 | { .id = 0x1106e714, .name = "VT1709 6-Ch", |
3265 | .patch = patch_vt1709_6ch}, | 3265 | .patch = patch_vt1709_6ch}, |
3266 | { .id = 0x1106E715, .name = "VIA VT1709 6-Ch", | 3266 | { .id = 0x1106e715, .name = "VT1709 6-Ch", |
3267 | .patch = patch_vt1709_6ch}, | 3267 | .patch = patch_vt1709_6ch}, |
3268 | { .id = 0x1106E716, .name = "VIA VT1709 6-Ch", | 3268 | { .id = 0x1106e716, .name = "VT1709 6-Ch", |
3269 | .patch = patch_vt1709_6ch}, | 3269 | .patch = patch_vt1709_6ch}, |
3270 | { .id = 0x1106E717, .name = "VIA VT1709 6-Ch", | 3270 | { .id = 0x1106e717, .name = "VT1709 6-Ch", |
3271 | .patch = patch_vt1709_6ch}, | 3271 | .patch = patch_vt1709_6ch}, |
3272 | { .id = 0x1106E720, .name = "VIA VT1708B 8-Ch", | 3272 | { .id = 0x1106e720, .name = "VT1708B 8-Ch", |
3273 | .patch = patch_vt1708B_8ch}, | 3273 | .patch = patch_vt1708B_8ch}, |
3274 | { .id = 0x1106E721, .name = "VIA VT1708B 8-Ch", | 3274 | { .id = 0x1106e721, .name = "VT1708B 8-Ch", |
3275 | .patch = patch_vt1708B_8ch}, | 3275 | .patch = patch_vt1708B_8ch}, |
3276 | { .id = 0x1106E722, .name = "VIA VT1708B 8-Ch", | 3276 | { .id = 0x1106e722, .name = "VT1708B 8-Ch", |
3277 | .patch = patch_vt1708B_8ch}, | 3277 | .patch = patch_vt1708B_8ch}, |
3278 | { .id = 0x1106E723, .name = "VIA VT1708B 8-Ch", | 3278 | { .id = 0x1106e723, .name = "VT1708B 8-Ch", |
3279 | .patch = patch_vt1708B_8ch}, | 3279 | .patch = patch_vt1708B_8ch}, |
3280 | { .id = 0x1106E724, .name = "VIA VT1708B 4-Ch", | 3280 | { .id = 0x1106e724, .name = "VT1708B 4-Ch", |
3281 | .patch = patch_vt1708B_4ch}, | 3281 | .patch = patch_vt1708B_4ch}, |
3282 | { .id = 0x1106E725, .name = "VIA VT1708B 4-Ch", | 3282 | { .id = 0x1106e725, .name = "VT1708B 4-Ch", |
3283 | .patch = patch_vt1708B_4ch}, | 3283 | .patch = patch_vt1708B_4ch}, |
3284 | { .id = 0x1106E726, .name = "VIA VT1708B 4-Ch", | 3284 | { .id = 0x1106e726, .name = "VT1708B 4-Ch", |
3285 | .patch = patch_vt1708B_4ch}, | 3285 | .patch = patch_vt1708B_4ch}, |
3286 | { .id = 0x1106E727, .name = "VIA VT1708B 4-Ch", | 3286 | { .id = 0x1106e727, .name = "VT1708B 4-Ch", |
3287 | .patch = patch_vt1708B_4ch}, | 3287 | .patch = patch_vt1708B_4ch}, |
3288 | { .id = 0x11060397, .name = "VIA VT1708S", | 3288 | { .id = 0x11060397, .name = "VT1708S", |
3289 | .patch = patch_vt1708S}, | 3289 | .patch = patch_vt1708S}, |
3290 | { .id = 0x11061397, .name = "VIA VT1708S", | 3290 | { .id = 0x11061397, .name = "VT1708S", |
3291 | .patch = patch_vt1708S}, | 3291 | .patch = patch_vt1708S}, |
3292 | { .id = 0x11062397, .name = "VIA VT1708S", | 3292 | { .id = 0x11062397, .name = "VT1708S", |
3293 | .patch = patch_vt1708S}, | 3293 | .patch = patch_vt1708S}, |
3294 | { .id = 0x11063397, .name = "VIA VT1708S", | 3294 | { .id = 0x11063397, .name = "VT1708S", |
3295 | .patch = patch_vt1708S}, | 3295 | .patch = patch_vt1708S}, |
3296 | { .id = 0x11064397, .name = "VIA VT1708S", | 3296 | { .id = 0x11064397, .name = "VT1708S", |
3297 | .patch = patch_vt1708S}, | 3297 | .patch = patch_vt1708S}, |
3298 | { .id = 0x11065397, .name = "VIA VT1708S", | 3298 | { .id = 0x11065397, .name = "VT1708S", |
3299 | .patch = patch_vt1708S}, | 3299 | .patch = patch_vt1708S}, |
3300 | { .id = 0x11066397, .name = "VIA VT1708S", | 3300 | { .id = 0x11066397, .name = "VT1708S", |
3301 | .patch = patch_vt1708S}, | 3301 | .patch = patch_vt1708S}, |
3302 | { .id = 0x11067397, .name = "VIA VT1708S", | 3302 | { .id = 0x11067397, .name = "VT1708S", |
3303 | .patch = patch_vt1708S}, | 3303 | .patch = patch_vt1708S}, |
3304 | { .id = 0x11060398, .name = "VIA VT1702", | 3304 | { .id = 0x11060398, .name = "VT1702", |
3305 | .patch = patch_vt1702}, | 3305 | .patch = patch_vt1702}, |
3306 | { .id = 0x11061398, .name = "VIA VT1702", | 3306 | { .id = 0x11061398, .name = "VT1702", |
3307 | .patch = patch_vt1702}, | 3307 | .patch = patch_vt1702}, |
3308 | { .id = 0x11062398, .name = "VIA VT1702", | 3308 | { .id = 0x11062398, .name = "VT1702", |
3309 | .patch = patch_vt1702}, | 3309 | .patch = patch_vt1702}, |
3310 | { .id = 0x11063398, .name = "VIA VT1702", | 3310 | { .id = 0x11063398, .name = "VT1702", |
3311 | .patch = patch_vt1702}, | 3311 | .patch = patch_vt1702}, |
3312 | { .id = 0x11064398, .name = "VIA VT1702", | 3312 | { .id = 0x11064398, .name = "VT1702", |
3313 | .patch = patch_vt1702}, | 3313 | .patch = patch_vt1702}, |
3314 | { .id = 0x11065398, .name = "VIA VT1702", | 3314 | { .id = 0x11065398, .name = "VT1702", |
3315 | .patch = patch_vt1702}, | 3315 | .patch = patch_vt1702}, |
3316 | { .id = 0x11066398, .name = "VIA VT1702", | 3316 | { .id = 0x11066398, .name = "VT1702", |
3317 | .patch = patch_vt1702}, | 3317 | .patch = patch_vt1702}, |
3318 | { .id = 0x11067398, .name = "VIA VT1702", | 3318 | { .id = 0x11067398, .name = "VT1702", |
3319 | .patch = patch_vt1702}, | 3319 | .patch = patch_vt1702}, |
3320 | {} /* terminator */ | 3320 | {} /* terminator */ |
3321 | }; | 3321 | }; |