Skip to content

Commit

Permalink
ALSA: line6: constify snd_kcontrol_new structures
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
goyalbhumika authored and tiwai committed Apr 12, 2017
1 parent 8fdaebb commit 49c41e1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sound/usb/line6/pod.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions sound/usb/line6/toneport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 49c41e1

Please sign in to comment.