aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_via.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/patch_via.c')
-rw-r--r--sound/pci/hda/patch_via.c28
1 files changed, 20 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index d1c3f8defc48..71f78456d682 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -2282,7 +2282,9 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
2282 const struct auto_pin_cfg *cfg) 2282 const struct auto_pin_cfg *cfg)
2283{ 2283{
2284 char name[32]; 2284 char name[32];
2285 static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; 2285 static const char * const chname[4] = {
2286 "Front", "Surround", "C/LFE", "Side"
2287 };
2286 hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b}; 2288 hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};
2287 int i, err; 2289 int i, err;
2288 2290
@@ -2371,7 +2373,7 @@ static void create_hp_imux(struct via_spec *spec)
2371{ 2373{
2372 int i; 2374 int i;
2373 struct hda_input_mux *imux = &spec->private_imux[1]; 2375 struct hda_input_mux *imux = &spec->private_imux[1];
2374 static const char *texts[] = { "OFF", "ON", NULL}; 2376 static const char * const texts[] = { "OFF", "ON", NULL};
2375 2377
2376 /* for hp mode select */ 2378 /* for hp mode select */
2377 for (i = 0; texts[i]; i++) 2379 for (i = 0; texts[i]; i++)
@@ -2891,7 +2893,9 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
2891 const struct auto_pin_cfg *cfg) 2893 const struct auto_pin_cfg *cfg)
2892{ 2894{
2893 char name[32]; 2895 char name[32];
2894 static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; 2896 static const char * const chname[4] = {
2897 "Front", "Surround", "C/LFE", "Side"
2898 };
2895 hda_nid_t nid, nid_vol, nid_vols[] = {0x18, 0x1a, 0x1b, 0x29}; 2899 hda_nid_t nid, nid_vol, nid_vols[] = {0x18, 0x1a, 0x1b, 0x29};
2896 int i, err; 2900 int i, err;
2897 2901
@@ -3434,7 +3438,9 @@ static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,
3434 const struct auto_pin_cfg *cfg) 3438 const struct auto_pin_cfg *cfg)
3435{ 3439{
3436 char name[32]; 3440 char name[32];
3437 static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; 3441 static const char * const chname[4] = {
3442 "Front", "Surround", "C/LFE", "Side"
3443 };
3438 hda_nid_t nid_vols[] = {0x16, 0x18, 0x26, 0x27}; 3444 hda_nid_t nid_vols[] = {0x16, 0x18, 0x26, 0x27};
3439 hda_nid_t nid, nid_vol = 0; 3445 hda_nid_t nid, nid_vol = 0;
3440 int i, err; 3446 int i, err;
@@ -3862,7 +3868,9 @@ static int vt1708S_auto_create_multi_out_ctls(struct via_spec *spec,
3862 const struct auto_pin_cfg *cfg) 3868 const struct auto_pin_cfg *cfg)
3863{ 3869{
3864 char name[32]; 3870 char name[32];
3865 static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; 3871 static const char * const chname[4] = {
3872 "Front", "Surround", "C/LFE", "Side"
3873 };
3866 hda_nid_t nid_vols[] = {0x10, 0x11, 0x24, 0x25}; 3874 hda_nid_t nid_vols[] = {0x10, 0x11, 0x24, 0x25};
3867 hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x26, 0x27}; 3875 hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x26, 0x27};
3868 hda_nid_t nid, nid_vol, nid_mute; 3876 hda_nid_t nid, nid_vol, nid_mute;
@@ -4305,7 +4313,7 @@ static int vt1702_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
4305{ 4313{
4306 int err, i; 4314 int err, i;
4307 struct hda_input_mux *imux; 4315 struct hda_input_mux *imux;
4308 static const char *texts[] = { "ON", "OFF", NULL}; 4316 static const char * const texts[] = { "ON", "OFF", NULL};
4309 if (!pin) 4317 if (!pin)
4310 return 0; 4318 return 0;
4311 spec->multiout.hp_nid = 0x1D; 4319 spec->multiout.hp_nid = 0x1D;
@@ -4616,7 +4624,9 @@ static int vt1718S_auto_create_multi_out_ctls(struct via_spec *spec,
4616 const struct auto_pin_cfg *cfg) 4624 const struct auto_pin_cfg *cfg)
4617{ 4625{
4618 char name[32]; 4626 char name[32];
4619 static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; 4627 static const char * const chname[4] = {
4628 "Front", "Surround", "C/LFE", "Side"
4629 };
4620 hda_nid_t nid_vols[] = {0x8, 0x9, 0xa, 0xb}; 4630 hda_nid_t nid_vols[] = {0x8, 0x9, 0xa, 0xb};
4621 hda_nid_t nid_mutes[] = {0x24, 0x25, 0x26, 0x27}; 4631 hda_nid_t nid_mutes[] = {0x24, 0x25, 0x26, 0x27};
4622 hda_nid_t nid, nid_vol, nid_mute = 0; 4632 hda_nid_t nid, nid_vol, nid_mute = 0;
@@ -5065,7 +5075,9 @@ static int vt1716S_auto_create_multi_out_ctls(struct via_spec *spec,
5065 const struct auto_pin_cfg *cfg) 5075 const struct auto_pin_cfg *cfg)
5066{ 5076{
5067 char name[32]; 5077 char name[32];
5068 static const char *chname[3] = { "Front", "Surround", "C/LFE" }; 5078 static const char * const chname[3] = {
5079 "Front", "Surround", "C/LFE"
5080 };
5069 hda_nid_t nid_vols[] = {0x10, 0x11, 0x25}; 5081 hda_nid_t nid_vols[] = {0x10, 0x11, 0x25};
5070 hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x27}; 5082 hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x27};
5071 hda_nid_t nid, nid_vol, nid_mute; 5083 hda_nid_t nid, nid_vol, nid_mute;