Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: ac97: Constify more text arrays

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

+15 -9
+14 -8
sound/pci/ac97/ac97_patch.c
··· 33 33 static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97, 34 34 const char *name); 35 35 static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, 36 - const unsigned int *tlv, const char **slaves); 36 + const unsigned int *tlv, 37 + const char * const *slaves); 37 38 38 39 /* 39 40 * Chip specific initialization ··· 3197 3196 ucontrol->value.enumerated.item[0] == 1 ? 0x2 : 0); 3198 3197 } 3199 3198 3200 - static const char *cm9761_dac_clock[] = { "AC-Link", "SPDIF-In", "Both" }; 3199 + static const char * const cm9761_dac_clock[] = { 3200 + "AC-Link", "SPDIF-In", "Both" 3201 + }; 3201 3202 static const struct ac97_enum cm9761_dac_clock_enum = 3202 3203 AC97_ENUM_SINGLE(AC97_CM9761_SPDIF_CTRL, 9, 3, cm9761_dac_clock); 3203 3204 ··· 3313 3310 #define AC97_CM9780_MULTI_CHAN 0x66 3314 3311 #define AC97_CM9780_SPDIF 0x6c 3315 3312 3316 - static const char *cm9780_ch_select[] = { "Front", "Side", "Center/LFE", "Rear" }; 3313 + static const char * const cm9780_ch_select[] = { 3314 + "Front", "Side", "Center/LFE", "Rear" 3315 + }; 3317 3316 static const struct ac97_enum cm9780_ch_select_enum = 3318 3317 AC97_ENUM_SINGLE(AC97_CM9780_MULTI_CHAN, 6, 4, cm9780_ch_select); 3319 3318 static const struct snd_kcontrol_new cm9780_controls[] = { ··· 3361 3356 AC97_SINGLE("Downmix Surround to Front", 0x5a, 11, 1, 0), 3362 3357 }; 3363 3358 3364 - static const char *slave_vols_vt1616[] = { 3359 + static const char * const slave_vols_vt1616[] = { 3365 3360 "Front Playback Volume", 3366 3361 "Surround Playback Volume", 3367 3362 "Center Playback Volume", ··· 3369 3364 NULL 3370 3365 }; 3371 3366 3372 - static const char *slave_sws_vt1616[] = { 3367 + static const char * const slave_sws_vt1616[] = { 3373 3368 "Front Playback Switch", 3374 3369 "Surround Playback Switch", 3375 3370 "Center Playback Switch", ··· 3390 3385 3391 3386 /* create a virtual master control and add slaves */ 3392 3387 static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, 3393 - const unsigned int *tlv, const char **slaves) 3388 + const unsigned int *tlv, 3389 + const char * const *slaves) 3394 3390 { 3395 3391 struct snd_kcontrol *kctl; 3396 - const char **s; 3392 + const char * const *s; 3397 3393 int err; 3398 3394 3399 3395 kctl = snd_ctl_make_virtual_master(name, tlv); ··· 3618 3612 struct vt1618_uaj_item { 3619 3613 unsigned short mask; 3620 3614 unsigned short shift; 3621 - const char *items[4]; 3615 + const char * const items[4]; 3622 3616 }; 3623 3617 3624 3618 /* This list reflects the vt1618 docs for Vendor Defined Register 0x60. */
+1 -1
sound/pci/ac97/ac97_patch.h
··· 49 49 unsigned char shift_l; 50 50 unsigned char shift_r; 51 51 unsigned short mask; 52 - const char **texts; 52 + const char * const *texts; 53 53 }; 54 54 55 55 #define AC97_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xtexts) \