summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBhumika Goyal <bhumirks@gmail.com>2017-05-17 07:38:56 -0400
committerTakashi Iwai <tiwai@suse.de>2017-05-21 03:07:56 -0400
commit3a84d6c940e666d85b1c58bbcda2248c54faa898 (patch)
tree74227d544120750a3f3e6af3bda7066640a6a6d5
parente0327a0f214154b517fa2b325acd8d42736ac95b (diff)
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: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/isa/gus/gus_main.c2
-rw-r--r--sound/isa/gus/gus_pcm.c4
-rw-r--r--sound/isa/sb/sb16_csp.c4
-rw-r--r--sound/isa/sb/sb16_main.c2
-rw-r--r--sound/isa/sscape.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 4490ee442ff4..3cf9b13c780a 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -82,7 +82,7 @@ static int snd_gus_joystick_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
82 return change; 82 return change;
83} 83}
84 84
85static struct snd_kcontrol_new snd_gus_joystick_control = { 85static const struct snd_kcontrol_new snd_gus_joystick_control = {
86 .iface = SNDRV_CTL_ELEM_IFACE_CARD, 86 .iface = SNDRV_CTL_ELEM_IFACE_CARD,
87 .name = "Joystick Speed", 87 .name = "Joystick Speed",
88 .info = snd_gus_joystick_info, 88 .info = snd_gus_joystick_info,
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 06505999155f..33c1891f469a 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -809,7 +809,7 @@ static int snd_gf1_pcm_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_
809 return change; 809 return change;
810} 810}
811 811
812static struct snd_kcontrol_new snd_gf1_pcm_volume_control = 812static const struct snd_kcontrol_new snd_gf1_pcm_volume_control =
813{ 813{
814 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 814 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
815 .name = "PCM Playback Volume", 815 .name = "PCM Playback Volume",
@@ -818,7 +818,7 @@ static struct snd_kcontrol_new snd_gf1_pcm_volume_control =
818 .put = snd_gf1_pcm_volume_put 818 .put = snd_gf1_pcm_volume_put
819}; 819};
820 820
821static struct snd_kcontrol_new snd_gf1_pcm_volume_control1 = 821static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =
822{ 822{
823 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 823 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
824 .name = "GPCM Playback Volume", 824 .name = "GPCM Playback Volume",
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index 48da2276683d..fa5780bb0c68 100644
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -1029,7 +1029,7 @@ static int snd_sb_qsound_space_put(struct snd_kcontrol *kcontrol, struct snd_ctl
1029 return change; 1029 return change;
1030} 1030}
1031 1031
1032static struct snd_kcontrol_new snd_sb_qsound_switch = { 1032static const struct snd_kcontrol_new snd_sb_qsound_switch = {
1033 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1033 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1034 .name = "3D Control - Switch", 1034 .name = "3D Control - Switch",
1035 .info = snd_sb_qsound_switch_info, 1035 .info = snd_sb_qsound_switch_info,
@@ -1037,7 +1037,7 @@ static struct snd_kcontrol_new snd_sb_qsound_switch = {
1037 .put = snd_sb_qsound_switch_put 1037 .put = snd_sb_qsound_switch_put
1038}; 1038};
1039 1039
1040static struct snd_kcontrol_new snd_sb_qsound_space = { 1040static const struct snd_kcontrol_new snd_sb_qsound_space = {
1041 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 1041 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
1042 .name = "3D Control - Space", 1042 .name = "3D Control - Space",
1043 .info = snd_sb_qsound_space_info, 1043 .info = snd_sb_qsound_space_info,
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index 8b2d6c6bfe97..4be1350f6649 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -737,7 +737,7 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct
737 return change; 737 return change;
738} 738}
739 739
740static struct snd_kcontrol_new snd_sb16_dma_control = { 740static const struct snd_kcontrol_new snd_sb16_dma_control = {
741 .iface = SNDRV_CTL_ELEM_IFACE_CARD, 741 .iface = SNDRV_CTL_ELEM_IFACE_CARD,
742 .name = "16-bit DMA Allocation", 742 .name = "16-bit DMA Allocation",
743 .info = snd_sb16_dma_control_info, 743 .info = snd_sb16_dma_control_info,
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 54f5758a1bb3..1cd2908e4f12 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -671,7 +671,7 @@ __skip_change:
671 return change; 671 return change;
672} 672}
673 673
674static struct snd_kcontrol_new midi_mixer_ctl = { 674static const struct snd_kcontrol_new midi_mixer_ctl = {
675 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 675 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
676 .name = "MIDI", 676 .name = "MIDI",
677 .info = sscape_midi_info, 677 .info = sscape_midi_info,