ALSA: pci: constify snd_kcontrol_new structures
Declare snd_kcontrol_new structures as const as they are only passed as an argument to the function snd_ctl_new1. This argument is of type const, so snd_kcontrol_new structures having the same property can be made const too. Done using Coccinelle: @r1 disable optional_qualifier @ identifier i; position p; @@ static struct snd_kcontrol_new i@p = {...}; @ok1@ identifier r1.i; position p; expression e1; @@ snd_ctl_new1(&i@p,e1) @bad@ position p!={r1.p,ok1.p}; identifier r1.i; @@ i@p @depends on !bad disable optional_qualifier@ identifier r1.i; @@ +const struct snd_kcontrol_new i; Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:

committed by
Takashi Iwai

parent
34371d236e
commit
f3b827e0b1
@@ -432,7 +432,7 @@ static int snd_ice1712_delta1010lt_wordclock_status_get(struct snd_kcontrol *kco
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status =
|
||||
static const struct snd_kcontrol_new snd_ice1712_delta1010lt_wordclock_status =
|
||||
{
|
||||
.access = (SNDRV_CTL_ELEM_ACCESS_READ),
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
|
@@ -719,7 +719,7 @@ static int snd_ice1712_ews88mt_input_sense_put(struct snd_kcontrol *kcontrol, st
|
||||
return ndata != data;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Input Sensitivity Switch",
|
||||
.info = snd_ice1712_ewx_io_sense_info,
|
||||
@@ -728,7 +728,7 @@ static struct snd_kcontrol_new snd_ice1712_ews88mt_input_sense = {
|
||||
.count = 8,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_ews88mt_output_sense = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Output Sensitivity Switch",
|
||||
.info = snd_ice1712_ewx_io_sense_info,
|
||||
|
@@ -279,7 +279,7 @@ static int snd_ice1712_digmix_route_ac97_put(struct snd_kcontrol *kcontrol, stru
|
||||
return val != nval;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_digmix_route_ac97 = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Digital Mixer To AC97",
|
||||
.info = snd_ice1712_digmix_route_ac97_info,
|
||||
@@ -1410,7 +1410,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch = {
|
||||
.private_value = 10,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("Multi ", CAPTURE, SWITCH),
|
||||
.info = snd_ice1712_pro_mixer_switch_info,
|
||||
@@ -1432,7 +1432,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume = {
|
||||
.tlv = { .p = db_scale_playback }
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_volume = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("Multi ", CAPTURE, VOLUME),
|
||||
.info = snd_ice1712_pro_mixer_volume_info,
|
||||
@@ -1630,7 +1630,7 @@ static int snd_ice1712_eeprom_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_eeprom = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_eeprom = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.name = "ICE1712 EEPROM",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
@@ -1666,7 +1666,7 @@ static int snd_ice1712_spdif_default_put(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_default =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_default =
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
|
||||
@@ -1717,7 +1717,7 @@ static int snd_ice1712_spdif_maskp_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_maskc =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_maskc =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@@ -1726,7 +1726,7 @@ static struct snd_kcontrol_new snd_ice1712_spdif_maskc =
|
||||
.get = snd_ice1712_spdif_maskc_get,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_maskp =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_maskp =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@@ -1753,7 +1753,7 @@ static int snd_ice1712_spdif_stream_put(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_spdif_stream =
|
||||
static const struct snd_kcontrol_new snd_ice1712_spdif_stream =
|
||||
{
|
||||
.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
|
||||
SNDRV_CTL_ELEM_ACCESS_INACTIVE),
|
||||
@@ -1878,7 +1878,7 @@ static int snd_ice1712_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_internal_clock = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Internal Clock",
|
||||
.info = snd_ice1712_pro_internal_clock_info,
|
||||
@@ -1943,7 +1943,7 @@ static int snd_ice1712_pro_internal_clock_default_put(struct snd_kcontrol *kcont
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_internal_clock_default = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Internal Clock Default",
|
||||
.info = snd_ice1712_pro_internal_clock_default_info,
|
||||
@@ -1974,7 +1974,7 @@ static int snd_ice1712_pro_rate_locking_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_rate_locking = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_rate_locking = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Locking",
|
||||
.info = snd_ice1712_pro_rate_locking_info,
|
||||
@@ -2005,7 +2005,7 @@ static int snd_ice1712_pro_rate_reset_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_pro_rate_reset = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_pro_rate_reset = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Reset",
|
||||
.info = snd_ice1712_pro_rate_reset_info,
|
||||
@@ -2173,7 +2173,7 @@ static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route = {
|
||||
.put = snd_ice1712_pro_route_analog_put,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_spdif_route = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, NONE) "Route",
|
||||
.info = snd_ice1712_pro_route_info,
|
||||
@@ -2215,7 +2215,7 @@ static int snd_ice1712_pro_volume_rate_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_volume_rate = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Volume Rate",
|
||||
.info = snd_ice1712_pro_volume_rate_info,
|
||||
@@ -2248,7 +2248,7 @@ static int snd_ice1712_pro_peak_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_ice1712_mixer_pro_peak = {
|
||||
static const struct snd_kcontrol_new snd_ice1712_mixer_pro_peak = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.name = "Multi Track Peak",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||
|
@@ -1598,7 +1598,7 @@ static int snd_vt1724_eeprom_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_eeprom = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_eeprom = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.name = "ICE1724 EEPROM",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
@@ -1711,7 +1711,7 @@ static int snd_vt1724_spdif_default_put(struct snd_kcontrol *kcontrol,
|
||||
return val != old;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_default =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_default =
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
|
||||
@@ -1743,7 +1743,7 @@ static int snd_vt1724_spdif_maskp_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_maskc =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_maskc =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@@ -1752,7 +1752,7 @@ static struct snd_kcontrol_new snd_vt1724_spdif_maskc =
|
||||
.get = snd_vt1724_spdif_maskc_get,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_maskp =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_maskp =
|
||||
{
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
@@ -1789,7 +1789,7 @@ static int snd_vt1724_spdif_sw_put(struct snd_kcontrol *kcontrol,
|
||||
return old != val;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_spdif_switch =
|
||||
static const struct snd_kcontrol_new snd_vt1724_spdif_switch =
|
||||
{
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
/* FIXME: the following conflict with IEC958 Playback Route */
|
||||
@@ -1964,7 +1964,7 @@ static int snd_vt1724_pro_internal_clock_put(struct snd_kcontrol *kcontrol,
|
||||
return old_rate != new_rate;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_pro_internal_clock = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_pro_internal_clock = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Internal Clock",
|
||||
.info = snd_vt1724_pro_internal_clock_info,
|
||||
@@ -1995,7 +1995,7 @@ static int snd_vt1724_pro_rate_locking_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_pro_rate_locking = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_pro_rate_locking = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Locking",
|
||||
.info = snd_vt1724_pro_rate_locking_info,
|
||||
@@ -2026,7 +2026,7 @@ static int snd_vt1724_pro_rate_reset_put(struct snd_kcontrol *kcontrol,
|
||||
return change;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_pro_rate_reset = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_pro_rate_reset = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Multi Track Rate Reset",
|
||||
.info = snd_vt1724_pro_rate_reset_info,
|
||||
@@ -2151,7 +2151,7 @@ static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route =
|
||||
.put = snd_vt1724_pro_route_analog_put,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_mixer_pro_spdif_route = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, NONE) "Route",
|
||||
.info = snd_vt1724_pro_route_info,
|
||||
@@ -2187,7 +2187,7 @@ static int snd_vt1724_pro_peak_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_vt1724_mixer_pro_peak = {
|
||||
static const struct snd_kcontrol_new snd_vt1724_mixer_pro_peak = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.name = "Multi Track Peak",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||
|
Reference in New Issue
Block a user