| Message ID | 1476543351-17858-2-git-send-email-Julia.Lawall@lip6.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d5bc18c148fd3d3ab7cbd3d976f7e27226f74dd8 |
| Headers | show |
On 2016年10月15日 22:55, Julia Lawall wrote: > Check for snd_soc_ops structures that are only stored in the ops field of a > snd_soc_dai_link structure. This field is declared const, so snd_soc_ops > structures that have this property can be declared as const also. > > The semantic patch that makes this change is as follows: > (http://coccinelle.lip6.fr/) > > // <smpl> > @r disable optional_qualifier@ > identifier i; > position p; > @@ > static struct snd_soc_ops i@p = { ... }; > > @ok1@ > identifier r.i; > struct snd_soc_dai_link e; > position p; > @@ > e.ops = &i@p; > > @ok2@ > identifier r.i, e; > position p; > @@ > struct snd_soc_dai_link e[] = { ..., { .ops = &i@p, }, ..., }; > > @bad@ > position p != {r.p,ok1.p,ok2.p}; > identifier r.i; > struct snd_soc_ops e; > @@ > e@i@p > > @depends on !bad disable optional_qualifier@ > identifier r.i; > @@ > static > +const > struct snd_soc_ops i = { ... }; > // </smpl> > > The effect on the layout of the .o file is shown by the following output of > the size command, first before then after the transformation: > > text data bss dec hex filename > 3865 2784 384 7033 1b79 sound/soc/intel/boards/broadwell.o > 3929 2720 384 7033 1b79 sound/soc/intel/boards/broadwell.o > > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Thanks. That works for me. Acked-by: Jie Yang <yang.jie@intel.com> thanks, ~Keyon > > --- > sound/soc/intel/boards/broadwell.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff -u -p a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c > --- a/sound/soc/intel/boards/broadwell.c > +++ b/sound/soc/intel/boards/broadwell.c > @@ -126,7 +126,7 @@ static int broadwell_rt286_hw_params(str > return ret; > } > > -static struct snd_soc_ops broadwell_rt286_ops = { > +static const struct snd_soc_ops broadwell_rt286_ops = { > .hw_params = broadwell_rt286_hw_params, > }; > > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >
diff -u -p a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -126,7 +126,7 @@ static int broadwell_rt286_hw_params(str return ret; } -static struct snd_soc_ops broadwell_rt286_ops = { +static const struct snd_soc_ops broadwell_rt286_ops = { .hw_params = broadwell_rt286_hw_params, };
Check for snd_soc_ops structures that are only stored in the ops field of a snd_soc_dai_link structure. This field is declared const, so snd_soc_ops structures that have this property can be declared as const also. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r disable optional_qualifier@ identifier i; position p; @@ static struct snd_soc_ops i@p = { ... }; @ok1@ identifier r.i; struct snd_soc_dai_link e; position p; @@ e.ops = &i@p; @ok2@ identifier r.i, e; position p; @@ struct snd_soc_dai_link e[] = { ..., { .ops = &i@p, }, ..., }; @bad@ position p != {r.p,ok1.p,ok2.p}; identifier r.i; struct snd_soc_ops e; @@ e@i@p @depends on !bad disable optional_qualifier@ identifier r.i; @@ static +const struct snd_soc_ops i = { ... }; // </smpl> The effect on the layout of the .o file is shown by the following output of the size command, first before then after the transformation: text data bss dec hex filename 3865 2784 384 7033 1b79 sound/soc/intel/boards/broadwell.o 3929 2720 384 7033 1b79 sound/soc/intel/boards/broadwell.o Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> --- sound/soc/intel/boards/broadwell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)