aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhumika Goyal <bhumirks@gmail.com>2017-04-12 09:08:06 -0400
committerTakashi Iwai <tiwai@suse.de>2017-04-12 09:34:44 -0400
commit8fdaebbb83b4e734c7ec1fcab5f1b26ec264965d (patch)
tree16277e6955d926edaaba0896b3665feac4abe1b7
parentf91c9d7610a2fe306273a83e2fd5351bceb85d28 (diff)
ALSA: usb-audio: constify snd_kcontrol_new structures
Declare snd_kcontrol_new strcutures 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 this property can be made const too. Done using Coccinelle: @r disable optional_qualifier@ identifier x; position p; @@ static struct snd_kcontrol_new x@p={...}; @ok@ identifier r.x; position p; @@ snd_ctl_new1(&x@p,...) @bad@ position p != {r.p,ok.p}; identifier r.x; @@ x@p @depends on !bad disable optional_qualifier@ identifier r.x; @@ +const struct snd_kcontrol_new x; Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/midi.c2
-rw-r--r--sound/usb/mixer.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 6e763bc8d7db..a35f41467237 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -1922,7 +1922,7 @@ static int roland_load_put(struct snd_kcontrol *kcontrol,
1922 return changed; 1922 return changed;
1923} 1923}
1924 1924
1925static struct snd_kcontrol_new roland_load_ctl = { 1925static const struct snd_kcontrol_new roland_load_ctl = {
1926 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1926 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1927 .name = "MIDI Input Mode", 1927 .name = "MIDI Input Mode",
1928 .info = roland_load_info, 1928 .info = roland_load_info,
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 4703caea56b2..082736c539bc 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1172,7 +1172,7 @@ static struct snd_kcontrol_new usb_feature_unit_ctl = {
1172}; 1172};
1173 1173
1174/* the read-only variant */ 1174/* the read-only variant */
1175static struct snd_kcontrol_new usb_feature_unit_ctl_ro = { 1175static const struct snd_kcontrol_new usb_feature_unit_ctl_ro = {
1176 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1176 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1177 .name = "", /* will be filled later manually */ 1177 .name = "", /* will be filled later manually */
1178 .info = mixer_ctl_feature_info, 1178 .info = mixer_ctl_feature_info,
@@ -1745,7 +1745,7 @@ static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol,
1745} 1745}
1746 1746
1747/* alsa control interface for processing/extension unit */ 1747/* alsa control interface for processing/extension unit */
1748static struct snd_kcontrol_new mixer_procunit_ctl = { 1748static const struct snd_kcontrol_new mixer_procunit_ctl = {
1749 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1749 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1750 .name = "", /* will be filled later */ 1750 .name = "", /* will be filled later */
1751 .info = mixer_ctl_feature_info, 1751 .info = mixer_ctl_feature_info,
@@ -2033,7 +2033,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol,
2033} 2033}
2034 2034
2035/* alsa control interface for selector unit */ 2035/* alsa control interface for selector unit */
2036static struct snd_kcontrol_new mixer_selectunit_ctl = { 2036static const struct snd_kcontrol_new mixer_selectunit_ctl = {
2037 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 2037 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
2038 .name = "", /* will be filled later */ 2038 .name = "", /* will be filled later */
2039 .info = mixer_ctl_selector_info, 2039 .info = mixer_ctl_selector_info,