diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-17 09:21:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-17 09:23:51 +0200 |
| commit | a2af050f8df6eeec29818639859f14eb237d6957 (patch) | |
| tree | 01dcad35cafbeefc951a68dd0c0f51ecf396ad3a /sound/pci/ice1712/quartet.c | |
| parent | 77b0b254af72add59c8125cd8799f390bc508f2b (diff) | |
| download | linux-stable-a2af050f8df6eeec29818639859f14eb237d6957.tar.gz linux-stable-a2af050f8df6eeec29818639859f14eb237d6957.tar.bz2 linux-stable-a2af050f8df6eeec29818639859f14eb237d6957.zip | |
ALSA: ice17xx: Constify strings and string arrays
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/quartet.c')
| -rw-r--r-- | sound/pci/ice1712/quartet.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/ice1712/quartet.c b/sound/pci/ice1712/quartet.c index 1948632787e6..462ef6716754 100644 --- a/sound/pci/ice1712/quartet.c +++ b/sound/pci/ice1712/quartet.c @@ -47,7 +47,7 @@ struct qtet_kcontrol_private { unsigned int bit; void (*set_register)(struct snd_ice1712 *ice, unsigned int val); unsigned int (*get_register)(struct snd_ice1712 *ice); - unsigned char *texts[2]; + unsigned char * const texts[2]; }; enum { @@ -63,7 +63,7 @@ enum { OUT34_MON12, }; -static char *ext_clock_names[3] = {"IEC958 In", "Word Clock 1xFS", +static const char * const ext_clock_names[3] = {"IEC958 In", "Word Clock 1xFS", "Word Clock 256xFS"}; /* chip address on I2C bus */ @@ -551,7 +551,8 @@ static int qtet_mute_put(struct snd_kcontrol *kcontrol, static int qtet_ain12_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - static char *texts[3] = {"Line In 1/2", "Mic", "Mic + Low-cut"}; + static const char * const texts[3] = + {"Line In 1/2", "Mic", "Mic + Low-cut"}; uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; uinfo->count = 1; uinfo->value.enumerated.items = ARRAY_SIZE(texts); @@ -816,7 +817,7 @@ static struct snd_kcontrol __devinit *ctl_find(struct snd_card *card, } static void __devinit add_slaves(struct snd_card *card, - struct snd_kcontrol *master, char **list) + struct snd_kcontrol *master, char * const *list) { for (; *list; list++) { struct snd_kcontrol *slave = ctl_find(card, *list); |