diff options
author | Bhumika Goyal <bhumirks@gmail.com> | 2017-04-12 09:10:47 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-04-12 09:35:16 -0400 |
commit | 49c41e1f23882f7950cff66992115bba03f1bbcf (patch) | |
tree | 075b440856d1b7bfe9f00a5feed0b2dfbb0b3bff | |
parent | 8fdaebbb83b4e734c7ec1fcab5f1b26ec264965d (diff) |
ALSA: line6: 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: Bhumika Goyal <bhumirks@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/usb/line6/pod.c | 2 | ||||
-rw-r--r-- | sound/usb/line6/toneport.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index 17aa616e61f5..358224cc5638 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c | |||
@@ -380,7 +380,7 @@ static int snd_pod_control_monitor_put(struct snd_kcontrol *kcontrol, | |||
380 | } | 380 | } |
381 | 381 | ||
382 | /* control definition */ | 382 | /* control definition */ |
383 | static struct snd_kcontrol_new pod_control_monitor = { | 383 | static const struct snd_kcontrol_new pod_control_monitor = { |
384 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 384 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
385 | .name = "Monitor Playback Volume", | 385 | .name = "Monitor Playback Volume", |
386 | .index = 0, | 386 | .index = 0, |
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index 8e22f430d700..ba7975c0d03d 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c | |||
@@ -250,7 +250,7 @@ static void toneport_start_pcm(unsigned long arg) | |||
250 | } | 250 | } |
251 | 251 | ||
252 | /* control definition */ | 252 | /* control definition */ |
253 | static struct snd_kcontrol_new toneport_control_monitor = { | 253 | static const struct snd_kcontrol_new toneport_control_monitor = { |
254 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 254 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
255 | .name = "Monitor Playback Volume", | 255 | .name = "Monitor Playback Volume", |
256 | .index = 0, | 256 | .index = 0, |
@@ -261,7 +261,7 @@ static struct snd_kcontrol_new toneport_control_monitor = { | |||
261 | }; | 261 | }; |
262 | 262 | ||
263 | /* source selector definition */ | 263 | /* source selector definition */ |
264 | static struct snd_kcontrol_new toneport_control_source = { | 264 | static const struct snd_kcontrol_new toneport_control_source = { |
265 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 265 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
266 | .name = "PCM Capture Source", | 266 | .name = "PCM Capture Source", |
267 | .index = 0, | 267 | .index = 0, |