Commit 8fdaebbb authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Takashi Iwai

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: default avatarBhumika Goyal <bhumirks@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f91c9d76
...@@ -1922,7 +1922,7 @@ static int roland_load_put(struct snd_kcontrol *kcontrol, ...@@ -1922,7 +1922,7 @@ static int roland_load_put(struct snd_kcontrol *kcontrol,
return changed; return changed;
} }
static struct snd_kcontrol_new roland_load_ctl = { static const struct snd_kcontrol_new roland_load_ctl = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "MIDI Input Mode", .name = "MIDI Input Mode",
.info = roland_load_info, .info = roland_load_info,
......
...@@ -1172,7 +1172,7 @@ static struct snd_kcontrol_new usb_feature_unit_ctl = { ...@@ -1172,7 +1172,7 @@ static struct snd_kcontrol_new usb_feature_unit_ctl = {
}; };
/* the read-only variant */ /* the read-only variant */
static struct snd_kcontrol_new usb_feature_unit_ctl_ro = { static const struct snd_kcontrol_new usb_feature_unit_ctl_ro = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "", /* will be filled later manually */ .name = "", /* will be filled later manually */
.info = mixer_ctl_feature_info, .info = mixer_ctl_feature_info,
...@@ -1745,7 +1745,7 @@ static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol, ...@@ -1745,7 +1745,7 @@ static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol,
} }
/* alsa control interface for processing/extension unit */ /* alsa control interface for processing/extension unit */
static struct snd_kcontrol_new mixer_procunit_ctl = { static const struct snd_kcontrol_new mixer_procunit_ctl = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "", /* will be filled later */ .name = "", /* will be filled later */
.info = mixer_ctl_feature_info, .info = mixer_ctl_feature_info,
...@@ -2033,7 +2033,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, ...@@ -2033,7 +2033,7 @@ static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol,
} }
/* alsa control interface for selector unit */ /* alsa control interface for selector unit */
static struct snd_kcontrol_new mixer_selectunit_ctl = { static const struct snd_kcontrol_new mixer_selectunit_ctl = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "", /* will be filled later */ .name = "", /* will be filled later */
.info = mixer_ctl_selector_info, .info = mixer_ctl_selector_info,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment