ALSA: line6: constify snd_kcontrol_new structures (49c41e1f) · Commits · 戴 / test

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>

sound/usb/line6/pod.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -380,7 +380,7 @@ static int snd_pod_control_monitor_put(struct snd_kcontrol *kcontrol,
		}

		/* control definition */
		static struct snd_kcontrol_new pod_control_monitor = {
		static const struct snd_kcontrol_new pod_control_monitor = {
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		.name = "Monitor Playback Volume",
		.index = 0,

sound/usb/line6/toneport.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ static void toneport_start_pcm(unsigned long arg)
		}

		/* control definition */
		static struct snd_kcontrol_new toneport_control_monitor = {
		static const struct snd_kcontrol_new toneport_control_monitor = {
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		.name = "Monitor Playback Volume",
		.index = 0,
		@@ -261,7 +261,7 @@ static struct snd_kcontrol_new toneport_control_monitor = {
		};

		/* source selector definition */
		static struct snd_kcontrol_new toneport_control_source = {
		static const struct snd_kcontrol_new toneport_control_source = {
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		.name = "PCM Capture Source",
		.index = 0,

Admin message