Commit 3a84d6c9 authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Takashi Iwai
Browse files

ALSA: sound/isa: constify snd_kcontrol_new structures 



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;

Signed-off-by: default avatarBhumika Goyal <bhumirks@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e0327a0f

sound/isa/gus/gus_main.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int snd_gus_joystick_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el 
	return change;

}



static struct snd_kcontrol_new snd_gus_joystick_control = {

static const struct snd_kcontrol_new snd_gus_joystick_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_CARD,

	.name = "Joystick Speed",

	.info = snd_gus_joystick_info,

sound/isa/gus/gus_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static int snd_gf1_pcm_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ 
	return change;

}



static struct snd_kcontrol_new snd_gf1_pcm_volume_control =

static const struct snd_kcontrol_new snd_gf1_pcm_volume_control =

{

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "PCM Playback Volume",
@@ -818,7 +818,7 @@ static struct snd_kcontrol_new snd_gf1_pcm_volume_control = 
	.put = snd_gf1_pcm_volume_put

};



static struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =

static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =

{

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "GPCM Playback Volume",

sound/isa/sb/sb16_csp.c

+2 −2
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ static int snd_sb_qsound_space_put(struct snd_kcontrol *kcontrol, struct snd_ctl 
	return change;

}



static struct snd_kcontrol_new snd_sb_qsound_switch = {

static const struct snd_kcontrol_new snd_sb_qsound_switch = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "3D Control - Switch",

	.info = snd_sb_qsound_switch_info,
@@ -1037,7 +1037,7 @@ static struct snd_kcontrol_new snd_sb_qsound_switch = { 
	.put = snd_sb_qsound_switch_put

};



static struct snd_kcontrol_new snd_sb_qsound_space = {

static const struct snd_kcontrol_new snd_sb_qsound_space = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "3D Control - Space",

	.info = snd_sb_qsound_space_info,

sound/isa/sb/sb16_main.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct 
	return change;

}



static struct snd_kcontrol_new snd_sb16_dma_control = {

static const struct snd_kcontrol_new snd_sb16_dma_control = {

	.iface = SNDRV_CTL_ELEM_IFACE_CARD,

	.name = "16-bit DMA Allocation",

	.info = snd_sb16_dma_control_info,

sound/isa/sscape.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ __skip_change: 
	return change;

}



static struct snd_kcontrol_new midi_mixer_ctl = {

static const struct snd_kcontrol_new midi_mixer_ctl = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "MIDI",

	.info = sscape_midi_info,

CRA Git | Maintained and supported by SUSTech CRA and CCSE