ALSA: ca0106: More constifications

[muen/linux.git] / sound / pci / ca0106 / ca0106_mixer.c

diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index c771995..3b8ec67 100644 (file)
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -739,7 +739,7 @@ static int rename_ctl(struct snd_card *card, const char *src, const char *dst)
 static
 DECLARE_TLV_DB_SCALE(snd_ca0106_master_db_scale, -6375, 25, 1);
 
-static char *slave_vols[] = {
+static const char * const slave_vols[] = {
        "Analog Front Playback Volume",
         "Analog Rear Playback Volume",
        "Analog Center/LFE Playback Volume",
@@ -752,7 +752,7 @@ static char *slave_vols[] = {
        NULL
 };
 
-static char *slave_sws[] = {
+static const char * const slave_sws[] = {
        "Analog Front Playback Switch",
        "Analog Rear Playback Switch",
        "Analog Center/LFE Playback Switch",
@@ -762,7 +762,7 @@ static char *slave_sws[] = {
 };
 
 static void add_slaves(struct snd_card *card,
-                                struct snd_kcontrol *master, char **list)
+                      struct snd_kcontrol *master, const char * const *list)
 {
        for (; *list; list++) {
                struct snd_kcontrol *slave = ctl_find(card, *list);
@@ -775,9 +775,9 @@ int snd_ca0106_mixer(struct snd_ca0106 *emu)
 {
        int err;
         struct snd_card *card = emu->card;
-       char **c;
+       const char * const *c;
        struct snd_kcontrol *vmaster;
-       static char *ca0106_remove_ctls[] = {
+       static const char * const ca0106_remove_ctls[] = {
                "Master Mono Playback Switch",
                "Master Mono Playback Volume",
                "3D Control - Switch",
@@ -801,7 +801,7 @@ int snd_ca0106_mixer(struct snd_ca0106 *emu)
                "Surround Phase Inversion Playback Switch",
                NULL
        };
-       static char *ca0106_rename_ctls[] = {
+       static const char * const ca0106_rename_ctls[] = {
                "Master Playback Switch", "Capture Switch",
                "Master Playback Volume", "Capture Volume",
                "Line Playback Switch", "AC97 Line Capture Switch",
@@ -875,7 +875,7 @@ struct ca0106_vol_tbl {
        unsigned int reg;
 };
 
-static struct ca0106_vol_tbl saved_volumes[NUM_SAVED_VOLUMES] = {
+static const struct ca0106_vol_tbl saved_volumes[NUM_SAVED_VOLUMES] = {
        { CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME2 },
        { CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME2 },
        { CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME2 },