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
@@ -1039,7 +1039,7 @@ static int snd_echo_output_gain_put(struct snd_kcontrol *kcontrol,
|
||||
|
||||
#ifdef ECHOCARD_HAS_LINE_OUT_GAIN
|
||||
/* On the Mia this one controls the line-out volume */
|
||||
static struct snd_kcontrol_new snd_echo_line_output_gain = {
|
||||
static const struct snd_kcontrol_new snd_echo_line_output_gain = {
|
||||
.name = "Line Playback Volume",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
|
||||
@@ -1050,7 +1050,7 @@ static struct snd_kcontrol_new snd_echo_line_output_gain = {
|
||||
.tlv = {.p = db_scale_output_gain},
|
||||
};
|
||||
#else
|
||||
static struct snd_kcontrol_new snd_echo_pcm_output_gain = {
|
||||
static const struct snd_kcontrol_new snd_echo_pcm_output_gain = {
|
||||
.name = "PCM Playback Volume",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,
|
||||
@@ -1120,7 +1120,7 @@ static int snd_echo_input_gain_put(struct snd_kcontrol *kcontrol,
|
||||
|
||||
static const DECLARE_TLV_DB_SCALE(db_scale_input_gain, -2500, 50, 0);
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_line_input_gain = {
|
||||
static const struct snd_kcontrol_new snd_echo_line_input_gain = {
|
||||
.name = "Line Capture Volume",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ,
|
||||
@@ -1184,7 +1184,7 @@ static int snd_echo_output_nominal_put(struct snd_kcontrol *kcontrol,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_output_nominal_level = {
|
||||
static const struct snd_kcontrol_new snd_echo_output_nominal_level = {
|
||||
.name = "Line Playback Switch (-10dBV)",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.info = snd_echo_output_nominal_info,
|
||||
@@ -1250,7 +1250,7 @@ static int snd_echo_input_nominal_put(struct snd_kcontrol *kcontrol,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_intput_nominal_level = {
|
||||
static const struct snd_kcontrol_new snd_echo_intput_nominal_level = {
|
||||
.name = "Line Capture Switch (-10dBV)",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.info = snd_echo_input_nominal_info,
|
||||
@@ -1477,7 +1477,7 @@ static int snd_echo_digital_mode_put(struct snd_kcontrol *kcontrol,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_digital_mode_switch = {
|
||||
static const struct snd_kcontrol_new snd_echo_digital_mode_switch = {
|
||||
.name = "Digital mode Switch",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.info = snd_echo_digital_mode_info,
|
||||
@@ -1527,7 +1527,7 @@ static int snd_echo_spdif_mode_put(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_spdif_mode_switch = {
|
||||
static const struct snd_kcontrol_new snd_echo_spdif_mode_switch = {
|
||||
.name = "S/PDIF mode Switch",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.info = snd_echo_spdif_mode_info,
|
||||
@@ -1600,7 +1600,7 @@ static int snd_echo_clock_source_put(struct snd_kcontrol *kcontrol,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_clock_source_switch = {
|
||||
static const struct snd_kcontrol_new snd_echo_clock_source_switch = {
|
||||
.name = "Sample Clock Source",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
||||
.info = snd_echo_clock_source_info,
|
||||
@@ -1643,7 +1643,7 @@ static int snd_echo_phantom_power_put(struct snd_kcontrol *kcontrol,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_phantom_power_switch = {
|
||||
static const struct snd_kcontrol_new snd_echo_phantom_power_switch = {
|
||||
.name = "Phantom power Switch",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.info = snd_echo_phantom_power_info,
|
||||
@@ -1686,7 +1686,7 @@ static int snd_echo_automute_put(struct snd_kcontrol *kcontrol,
|
||||
return changed;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_automute_switch = {
|
||||
static const struct snd_kcontrol_new snd_echo_automute_switch = {
|
||||
.name = "Digital Capture Switch (automute)",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.info = snd_echo_automute_info,
|
||||
@@ -1713,7 +1713,7 @@ static int snd_echo_vumeters_switch_put(struct snd_kcontrol *kcontrol,
|
||||
return 1;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_vumeters_switch = {
|
||||
static const struct snd_kcontrol_new snd_echo_vumeters_switch = {
|
||||
.name = "VU-meters Switch",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_WRITE,
|
||||
@@ -1751,7 +1751,7 @@ static int snd_echo_vumeters_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_vumeters = {
|
||||
static const struct snd_kcontrol_new snd_echo_vumeters = {
|
||||
.name = "VU-meters",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ |
|
||||
@@ -1804,7 +1804,7 @@ static int snd_echo_channels_info_get(struct snd_kcontrol *kcontrol,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new snd_echo_channels_info = {
|
||||
static const struct snd_kcontrol_new snd_echo_channels_info = {
|
||||
.name = "Channels info",
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_HWDEP,
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
|
||||
|
Reference in New Issue
Block a user