ALSA: declare snd_kcontrol_new structures as const
Declare snd_kcontrol_new structures as const as they are only passed 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. 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; Cross compiled these files: sound/aoa/codecs/tas.c - powerpc sound/mips/{hal2.c/sgio2audio.c} - mips sound/ppc/{awacs.c/beep.c/tumbler.c} - powerpc sound/soc/sh/siu_dai.c - sh Could not find an architecture to compile sound/sh/aica.c. Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
このコミットが含まれているのは:
@@ -264,7 +264,7 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol,
|
||||
return old != new;
|
||||
}
|
||||
|
||||
static struct snd_kcontrol_new hal2_ctrl_headphone = {
|
||||
static const struct snd_kcontrol_new hal2_ctrl_headphone = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Headphone Playback Volume",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
|
||||
@@ -274,7 +274,7 @@ static struct snd_kcontrol_new hal2_ctrl_headphone = {
|
||||
.put = hal2_gain_put,
|
||||
};
|
||||
|
||||
static struct snd_kcontrol_new hal2_ctrl_mic = {
|
||||
static const struct snd_kcontrol_new hal2_ctrl_mic = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Mic Capture Volume",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
|
||||
|
@@ -230,7 +230,7 @@ static int sgio2audio_source_put(struct snd_kcontrol *kcontrol,
|
||||
}
|
||||
|
||||
/* dac1/pcm0 mixer control */
|
||||
static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = {
|
||||
static const struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "PCM Playback Volume",
|
||||
.index = 0,
|
||||
@@ -242,7 +242,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = {
|
||||
};
|
||||
|
||||
/* dac2/pcm1 mixer control */
|
||||
static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = {
|
||||
static const struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "PCM Playback Volume",
|
||||
.index = 1,
|
||||
@@ -254,7 +254,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = {
|
||||
};
|
||||
|
||||
/* record level mixer control */
|
||||
static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = {
|
||||
static const struct snd_kcontrol_new sgio2audio_ctrl_reclevel = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Capture Volume",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
|
||||
@@ -265,7 +265,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = {
|
||||
};
|
||||
|
||||
/* record level source control */
|
||||
static struct snd_kcontrol_new sgio2audio_ctrl_recsource = {
|
||||
static const struct snd_kcontrol_new sgio2audio_ctrl_recsource = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Capture Source",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
|
||||
@@ -275,7 +275,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_recsource = {
|
||||
};
|
||||
|
||||
/* line mixer control */
|
||||
static struct snd_kcontrol_new sgio2audio_ctrl_line = {
|
||||
static const struct snd_kcontrol_new sgio2audio_ctrl_line = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Line Playback Volume",
|
||||
.index = 0,
|
||||
@@ -287,7 +287,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_line = {
|
||||
};
|
||||
|
||||
/* cd mixer control */
|
||||
static struct snd_kcontrol_new sgio2audio_ctrl_cd = {
|
||||
static const struct snd_kcontrol_new sgio2audio_ctrl_cd = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Line Playback Volume",
|
||||
.index = 1,
|
||||
@@ -299,7 +299,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_cd = {
|
||||
};
|
||||
|
||||
/* mic mixer control */
|
||||
static struct snd_kcontrol_new sgio2audio_ctrl_mic = {
|
||||
static const struct snd_kcontrol_new sgio2audio_ctrl_mic = {
|
||||
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
|
||||
.name = "Mic Playback Volume",
|
||||
.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
|
||||
|
新しいイシューから参照
ユーザーをブロックする