ALSA: hda: Constify snd_kcontrol_new items

[muen/linux.git] / sound / pci / hda / hda_codec.c

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 8f166bb..d039eee 100644 (file)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2387,7 +2387,7 @@ static int snd_hda_spdif_out_switch_put(struct snd_kcontrol *kcontrol,
        return change;
 }
 
        return change;
 }
 

-static struct snd_kcontrol_new dig_mixes[] = {
+static const struct snd_kcontrol_new dig_mixes[] = {

        {
                .access = SNDRV_CTL_ELEM_ACCESS_READ,
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
        {
                .access = SNDRV_CTL_ELEM_ACCESS_READ,
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,


@@ -2437,7 +2437,7 @@ int snd_hda_create_dig_out_ctls(struct hda_codec *codec,
 {
        int err;
        struct snd_kcontrol *kctl;
 {
        int err;
        struct snd_kcontrol *kctl;

-       struct snd_kcontrol_new *dig_mix;
+       const struct snd_kcontrol_new *dig_mix;

        int idx = 0;
        int val = 0;
        const int spdif_index = 16;
        int idx = 0;
        int val = 0;
        const int spdif_index = 16;


@@ -2655,7 +2655,7 @@ static int snd_hda_spdif_in_status_get(struct snd_kcontrol *kcontrol,
        return 0;
 }
 
        return 0;
 }
 

-static struct snd_kcontrol_new dig_in_ctls[] = {
+static const struct snd_kcontrol_new dig_in_ctls[] = {

        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = SNDRV_CTL_NAME_IEC958("", CAPTURE, SWITCH),
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = SNDRV_CTL_NAME_IEC958("", CAPTURE, SWITCH),


@@ -2687,7 +2687,7 @@ int snd_hda_create_spdif_in_ctls(struct hda_codec *codec, hda_nid_t nid)
 {
        int err;
        struct snd_kcontrol *kctl;
 {
        int err;
        struct snd_kcontrol *kctl;

-       struct snd_kcontrol_new *dig_mix;
+       const struct snd_kcontrol_new *dig_mix;

        int idx;
 
        idx = find_empty_mixer_ctl_idx(codec, "IEC958 Capture Switch", 0);
        int idx;
 
        idx = find_empty_mixer_ctl_idx(codec, "IEC958 Capture Switch", 0);