lkml.org 
[lkml]   [2016]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] ASoC: constify snd_soc_ops structures
    Date
    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 files is shown by the following output of
    the size command, first before then after the transformation:

    text data bss dec hex filename
    8748 1024 0 9772 262c sound/soc/fsl/fsl-asoc-card.o
    8812 952 0 9764 2624 sound/soc/fsl/fsl-asoc-card.o

    text data bss dec hex filename
    4165 264 8 4437 1155 sound/soc/fsl/imx-wm8962.o
    4229 200 8 4437 1155 sound/soc/fsl/imx-wm8962.o

    Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

    ---
    sound/soc/fsl/fsl-asoc-card.c | 2 +-
    sound/soc/fsl/imx-wm8962.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff -u -p a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
    --- a/sound/soc/fsl/fsl-asoc-card.c
    +++ b/sound/soc/fsl/fsl-asoc-card.c
    @@ -183,7 +183,7 @@ static int fsl_asoc_card_hw_params(struc
    return 0;
    }

    -static struct snd_soc_ops fsl_asoc_card_ops = {
    +static const struct snd_soc_ops fsl_asoc_card_ops = {
    .hw_params = fsl_asoc_card_hw_params,
    };

    diff -u -p a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
    --- a/sound/soc/fsl/imx-wm8962.c
    +++ b/sound/soc/fsl/imx-wm8962.c
    @@ -61,7 +61,7 @@ static int imx_hifi_hw_params(struct snd
    return 0;
    }

    -static struct snd_soc_ops imx_hifi_ops = {
    +static const struct snd_soc_ops imx_hifi_ops = {
    .hw_params = imx_hifi_hw_params,
    };

    \
     
     \ /
      Last update: 2016-10-15 17:16    [W:3.685 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site