[alsa-devel] [PATCH] 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 --- sound/isa/gus/gus_main.c | 2 +- sound/isa/gus/gus_pcm.c | 4 ++-- sound/isa/sb/sb16_csp.c | 4 ++-- sound/isa/sb/sb16_main.c | 2 +- sound/isa/sscape.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index 4490ee4..3cf9b13 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 return change; }
-static struct snd_kcontrol_new snd_gus_joystick_control = { +static const struct snd_kcontrol_new snd_gus_joystick_control = { .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = "Joystick Speed", .info = snd_gus_joystick_info, diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c index 0650599..33c1891 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_ return change; }
-static struct snd_kcontrol_new snd_gf1_pcm_volume_control = +static const struct snd_kcontrol_new snd_gf1_pcm_volume_control = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "PCM Playback Volume", @@ -818,7 +818,7 @@ static struct snd_kcontrol_new snd_gf1_pcm_volume_control = .put = snd_gf1_pcm_volume_put };
-static struct snd_kcontrol_new snd_gf1_pcm_volume_control1 = +static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "GPCM Playback Volume", diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c index 48da227..fa5780b 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 return change; }
-static struct snd_kcontrol_new snd_sb_qsound_switch = { +static const struct snd_kcontrol_new snd_sb_qsound_switch = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "3D Control - Switch", .info = snd_sb_qsound_switch_info, @@ -1037,7 +1037,7 @@ static struct snd_kcontrol_new snd_sb_qsound_switch = { .put = snd_sb_qsound_switch_put };
-static struct snd_kcontrol_new snd_sb_qsound_space = { +static const struct snd_kcontrol_new snd_sb_qsound_space = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "3D Control - Space", .info = snd_sb_qsound_space_info, diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c index 8b2d6c6..4be1350 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 return change; }
-static struct snd_kcontrol_new snd_sb16_dma_control = { +static const struct snd_kcontrol_new snd_sb16_dma_control = { .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = "16-bit DMA Allocation", .info = snd_sb16_dma_control_info, diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 54f5758a..1cd2908 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -671,7 +671,7 @@ static int sscape_midi_put(struct snd_kcontrol *kctl, return change; }
-static struct snd_kcontrol_new midi_mixer_ctl = { +static const struct snd_kcontrol_new midi_mixer_ctl = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "MIDI", .info = sscape_midi_info,
On Wed, 17 May 2017 13:38:56 +0200, Bhumika Goyal wrote:
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
As I already asked, could you send as a patchset if you have multiple similar patches?
thanks,
Takashi
On Wed, May 17, 2017 at 5:50 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 13:38:56 +0200, Bhumika Goyal wrote:
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
As I already asked, could you send as a patchset if you have multiple similar patches?
Sure. Will combine the already sent ones and some new ones into a patchset and send again.
Thanks, Bhumika
thanks,
Takashi
On Wed, 17 May 2017 14:33:45 +0200, Bhumika Goyal wrote:
On Wed, May 17, 2017 at 5:50 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 13:38:56 +0200, Bhumika Goyal wrote:
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
As I already asked, could you send as a patchset if you have multiple similar patches?
Sure. Will combine the already sent ones and some new ones into a patchset and send again.
Well, since there haven't been new submissions and the patches are trivial, I applied the existing four patches. If you have newer ones, please submit as a patchset.
thanks,
Takashi
On Sun, May 21, 2017 at 12:39 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 14:33:45 +0200, Bhumika Goyal wrote:
On Wed, May 17, 2017 at 5:50 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 13:38:56 +0200, Bhumika Goyal wrote:
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
As I already asked, could you send as a patchset if you have multiple similar patches?
Sure. Will combine the already sent ones and some new ones into a patchset and send again.
Well, since there haven't been new submissions and the patches are trivial, I applied the existing four patches. If you have newer ones, please submit as a patchset.
Hey,
Thanks for applying the patches. I have a doubt that since some of my coming patches are for the sound subsystem containing similar changes and you will be applying those, so can I combine and put all the changes in a single patch or sending a patchset would be a correct way.
Thanks, Bhumika
thanks,
Takashi
On Mon, 22 May 2017, Bhumika Goyal wrote:
On Sun, May 21, 2017 at 12:39 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 14:33:45 +0200, Bhumika Goyal wrote:
On Wed, May 17, 2017 at 5:50 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 13:38:56 +0200, Bhumika Goyal wrote:
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
As I already asked, could you send as a patchset if you have multiple similar patches?
Sure. Will combine the already sent ones and some new ones into a patchset and send again.
Well, since there haven't been new submissions and the patches are trivial, I applied the existing four patches. If you have newer ones, please submit as a patchset.
Hey,
Thanks for applying the patches. I have a doubt that since some of my coming patches are for the sound subsystem containing similar changes and you will be applying those, so can I combine and put all the changes in a single patch or sending a patchset would be a correct way.
I think he means that when you have more sound patches, just do them all at once.
julia
On Mon, 22 May 2017 08:20:45 +0200, Julia Lawall wrote:
On Mon, 22 May 2017, Bhumika Goyal wrote:
On Sun, May 21, 2017 at 12:39 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 14:33:45 +0200, Bhumika Goyal wrote:
On Wed, May 17, 2017 at 5:50 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 13:38:56 +0200, Bhumika Goyal wrote:
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
As I already asked, could you send as a patchset if you have multiple similar patches?
Sure. Will combine the already sent ones and some new ones into a patchset and send again.
Well, since there haven't been new submissions and the patches are trivial, I applied the existing four patches. If you have newer ones, please submit as a patchset.
Hey,
Thanks for applying the patches. I have a doubt that since some of my coming patches are for the sound subsystem containing similar changes and you will be applying those, so can I combine and put all the changes in a single patch or sending a patchset would be a correct way.
I think he means that when you have more sound patches, just do them all at once.
Yes, that's my point.
You've sent each patch individually, and this made me difficult to pick up, as I had to wonder "is this really all?" (then 10 minutes later another patch arrived :)
At best, submit all the relevant patches via git-send-email with the proper cover letter in a single thread.
thanks,
Takashi
On Mon, May 22, 2017 at 11:59 AM, Takashi Iwai tiwai@suse.de wrote:
On Mon, 22 May 2017 08:20:45 +0200, Julia Lawall wrote:
On Mon, 22 May 2017, Bhumika Goyal wrote:
On Sun, May 21, 2017 at 12:39 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 14:33:45 +0200, Bhumika Goyal wrote:
On Wed, May 17, 2017 at 5:50 PM, Takashi Iwai tiwai@suse.de wrote:
On Wed, 17 May 2017 13:38:56 +0200, Bhumika Goyal wrote: > > 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
As I already asked, could you send as a patchset if you have multiple similar patches?
Sure. Will combine the already sent ones and some new ones into a patchset and send again.
Well, since there haven't been new submissions and the patches are trivial, I applied the existing four patches. If you have newer ones, please submit as a patchset.
Hey,
Thanks for applying the patches. I have a doubt that since some of my coming patches are for the sound subsystem containing similar changes and you will be applying those, so can I combine and put all the changes in a single patch or sending a patchset would be a correct way.
I think he means that when you have more sound patches, just do them all at once.
Yes, that's my point.
You've sent each patch individually, and this made me difficult to pick up, as I had to wonder "is this really all?" (then 10 minutes later another patch arrived :)
At best, submit all the relevant patches via git-send-email with the proper cover letter in a single thread.
Thanks Julia and Takashi for clearing my doubt. I will keep this point in mind for my future patches :)
Thanks, Bhumika
thanks,
Takashi
participants (3)
-
Bhumika Goyal -
Julia Lawall -
Takashi Iwai