Commit 6ba1ad38 authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Takashi Iwai
Browse files

ALSA: ice1712: 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 3a84d6c9

sound/pci/ice1712/ice1712.c

+3 −3
Original line number Diff line number Diff line
@@ -1401,7 +1401,7 @@ static struct snd_kcontrol_new snd_ice1712_multi_playback_ctrls[] = { 
	},

};



static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch = {

static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_switch = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "H/W Multi Capture Switch",

	.info = snd_ice1712_pro_mixer_switch_info,
@@ -1420,7 +1420,7 @@ static const struct snd_kcontrol_new snd_ice1712_multi_capture_spdif_switch = { 
	.count = 2,

};



static struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume = {

static const struct snd_kcontrol_new snd_ice1712_multi_capture_analog_volume = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |

		   SNDRV_CTL_ELEM_ACCESS_TLV_READ),
@@ -2165,7 +2165,7 @@ static int snd_ice1712_pro_route_spdif_put(struct snd_kcontrol *kcontrol, 
	return change;

}



static struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route = {

static const struct snd_kcontrol_new snd_ice1712_mixer_pro_analog_route = {

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "H/W Playback Route",

	.info = snd_ice1712_pro_route_info,

sound/pci/ice1712/ice1724.c

+1 −1
Original line number Diff line number Diff line
@@ -2142,7 +2142,7 @@ static int snd_vt1724_pro_route_spdif_put(struct snd_kcontrol *kcontrol, 
					 digital_route_shift(idx));

}



static struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route =

static const struct snd_kcontrol_new snd_vt1724_mixer_pro_analog_route =

{

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "H/W Playback Route",

CRA Git | Maintained and supported by SUSTech CRA and CCSE