diff options
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index e96581fcdbdb..9bb030a469cd 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -537,13 +537,13 @@ static struct snd_kcontrol_new cxt_beep_mixer[] = { | |||
| 537 | }; | 537 | }; |
| 538 | #endif | 538 | #endif |
| 539 | 539 | ||
| 540 | static const char *slave_vols[] = { | 540 | static const char * const slave_vols[] = { |
| 541 | "Headphone Playback Volume", | 541 | "Headphone Playback Volume", |
| 542 | "Speaker Playback Volume", | 542 | "Speaker Playback Volume", |
| 543 | NULL | 543 | NULL |
| 544 | }; | 544 | }; |
| 545 | 545 | ||
| 546 | static const char *slave_sws[] = { | 546 | static const char * const slave_sws[] = { |
| 547 | "Headphone Playback Switch", | 547 | "Headphone Playback Switch", |
| 548 | "Speaker Playback Switch", | 548 | "Speaker Playback Switch", |
| 549 | NULL | 549 | NULL |
| @@ -1134,7 +1134,7 @@ enum { | |||
| 1134 | CXT5045_MODELS | 1134 | CXT5045_MODELS |
| 1135 | }; | 1135 | }; |
| 1136 | 1136 | ||
| 1137 | static const char *cxt5045_models[CXT5045_MODELS] = { | 1137 | static const char * const cxt5045_models[CXT5045_MODELS] = { |
| 1138 | [CXT5045_LAPTOP_HPSENSE] = "laptop-hpsense", | 1138 | [CXT5045_LAPTOP_HPSENSE] = "laptop-hpsense", |
| 1139 | [CXT5045_LAPTOP_MICSENSE] = "laptop-micsense", | 1139 | [CXT5045_LAPTOP_MICSENSE] = "laptop-micsense", |
| 1140 | [CXT5045_LAPTOP_HPMICSENSE] = "laptop-hpmicsense", | 1140 | [CXT5045_LAPTOP_HPMICSENSE] = "laptop-hpmicsense", |
| @@ -1579,7 +1579,7 @@ enum { | |||
| 1579 | CXT5047_MODELS | 1579 | CXT5047_MODELS |
| 1580 | }; | 1580 | }; |
| 1581 | 1581 | ||
| 1582 | static const char *cxt5047_models[CXT5047_MODELS] = { | 1582 | static const char * const cxt5047_models[CXT5047_MODELS] = { |
| 1583 | [CXT5047_LAPTOP] = "laptop", | 1583 | [CXT5047_LAPTOP] = "laptop", |
| 1584 | [CXT5047_LAPTOP_HP] = "laptop-hp", | 1584 | [CXT5047_LAPTOP_HP] = "laptop-hp", |
| 1585 | [CXT5047_LAPTOP_EAPD] = "laptop-eapd", | 1585 | [CXT5047_LAPTOP_EAPD] = "laptop-eapd", |
| @@ -1995,7 +1995,7 @@ enum { | |||
| 1995 | CXT5051_MODELS | 1995 | CXT5051_MODELS |
| 1996 | }; | 1996 | }; |
| 1997 | 1997 | ||
| 1998 | static const char *cxt5051_models[CXT5051_MODELS] = { | 1998 | static const char *const cxt5051_models[CXT5051_MODELS] = { |
| 1999 | [CXT5051_LAPTOP] = "laptop", | 1999 | [CXT5051_LAPTOP] = "laptop", |
| 2000 | [CXT5051_HP] = "hp", | 2000 | [CXT5051_HP] = "hp", |
| 2001 | [CXT5051_HP_DV6736] = "hp-dv6736", | 2001 | [CXT5051_HP_DV6736] = "hp-dv6736", |
| @@ -3084,7 +3084,7 @@ enum { | |||
| 3084 | CXT5066_MODELS | 3084 | CXT5066_MODELS |
| 3085 | }; | 3085 | }; |
| 3086 | 3086 | ||
| 3087 | static const char *cxt5066_models[CXT5066_MODELS] = { | 3087 | static const char * const cxt5066_models[CXT5066_MODELS] = { |
| 3088 | [CXT5066_LAPTOP] = "laptop", | 3088 | [CXT5066_LAPTOP] = "laptop", |
| 3089 | [CXT5066_DELL_LAPTOP] = "dell-laptop", | 3089 | [CXT5066_DELL_LAPTOP] = "dell-laptop", |
| 3090 | [CXT5066_OLPC_XO_1_5] = "olpc-xo-1_5", | 3090 | [CXT5066_OLPC_XO_1_5] = "olpc-xo-1_5", |
| @@ -3746,7 +3746,7 @@ static int cx_auto_build_output_controls(struct hda_codec *codec) | |||
| 3746 | struct conexant_spec *spec = codec->spec; | 3746 | struct conexant_spec *spec = codec->spec; |
| 3747 | int i, err; | 3747 | int i, err; |
| 3748 | int num_line = 0, num_hp = 0, num_spk = 0; | 3748 | int num_line = 0, num_hp = 0, num_spk = 0; |
| 3749 | static const char *texts[3] = { "Front", "Surround", "CLFE" }; | 3749 | static const char * const texts[3] = { "Front", "Surround", "CLFE" }; |
| 3750 | 3750 | ||
| 3751 | if (spec->dac_info_filled == 1) | 3751 | if (spec->dac_info_filled == 1) |
| 3752 | return cx_auto_add_pb_volume(codec, spec->dac_info[0].dac, | 3752 | return cx_auto_add_pb_volume(codec, spec->dac_info[0].dac, |
