Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230612122926.107333-1-herve.codina@bootlin.com> <20230612122926.107333-11-herve.codina@bootlin.com>
In-Reply-To: <20230612122926.107333-11-herve.codina@bootlin.com>
From:   Andy Shevchenko <andy.shevchenko@gmail.com>
Date:   Mon, 12 Jun 2023 17:23:02 +0300
Message-ID: <CAHp75VcZPFAzB8Sw_m1J4cU=+_YKJ6Ru8o7tCiZ3Z0haQre-zg@mail.gmail.com>
Subject: Re: [PATCH v3 10/12] ASoC: soc-dapm.h: Convert macros to return a
 compound litteral
To:     Herve Codina <herve.codina@bootlin.com>
Cc:     Liam Girdwood <lgirdwood@gmail.com>,
        Mark Brown <broonie@kernel.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>,
        Jonathan Cameron <jic23@kernel.org>,
        Lars-Peter Clausen <lars@metafoo.de>,
        Jaroslav Kysela <perex@perex.cz>,
        Takashi Iwai <tiwai@suse.com>,
        Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
        alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
        Christophe Leroy <christophe.leroy@csgroup.eu>,
        Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jun 12, 2023 at 3:30=E2=80=AFPM Herve Codina <herve.codina@bootlin.=
com> wrote:
>
> The SND_SOC_DAPM_* helpers family are used to build widgets array in a
> static way.
>
> Convert them to return a compound litteral in order to use them in both

literal

> static and dynamic way.
> With this conversion, the different SND_SOC_DAPM_* parameters can be
> computed by the code and the widget can be built based on this parameter
> computation.
>   static int create_widget(char *input_name)
>   {
>           struct snd_soc_dapm_widget widget;
>           char name*;
>           ...
>           name =3D input_name;
>           if (!name)
>                   name =3D "default";
>
>           widget =3D SND_SOC_DAPM_INPUT(name);
>           ...
>   }

Suggested-by:?

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Signed-off-by: Herve Codina <herve.codina@bootlin.com>
> ---
>  include/sound/soc-dapm.h | 138 ++++++++++++++++++++++++++-------------
>  1 file changed, 92 insertions(+), 46 deletions(-)
>
> diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
> index 87f8e1793af1..2e38dff16779 100644
> --- a/include/sound/soc-dapm.h
> +++ b/include/sound/soc-dapm.h
> @@ -42,36 +42,45 @@ struct soc_enum;
>
>  /* codec domain */
>  #define SND_SOC_DAPM_VMID(wname) \
> -{      .id =3D snd_soc_dapm_vmid, .name =3D wname, .kcontrol_news =3D NU=
LL, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_vmid, .name =3D wname, .kcontrol_news =3D NU=
LL, \
>         .num_kcontrols =3D 0}
>
>  /* platform domain */
>  #define SND_SOC_DAPM_SIGGEN(wname) \
> -{      .id =3D snd_soc_dapm_siggen, .name =3D wname, .kcontrol_news =3D =
NULL, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_siggen, .name =3D wname, .kcontrol_news =3D =
NULL, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM }
>  #define SND_SOC_DAPM_SINK(wname) \
> -{      .id =3D snd_soc_dapm_sink, .name =3D wname, .kcontrol_news =3D NU=
LL, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_sink, .name =3D wname, .kcontrol_news =3D NU=
LL, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM }
>  #define SND_SOC_DAPM_INPUT(wname) \
> -{      .id =3D snd_soc_dapm_input, .name =3D wname, .kcontrol_news =3D N=
ULL, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_input, .name =3D wname, .kcontrol_news =3D N=
ULL, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM }
>  #define SND_SOC_DAPM_OUTPUT(wname) \
> -{      .id =3D snd_soc_dapm_output, .name =3D wname, .kcontrol_news =3D =
NULL, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_output, .name =3D wname, .kcontrol_news =3D =
NULL, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM }
>  #define SND_SOC_DAPM_MIC(wname, wevent) \
> -{      .id =3D snd_soc_dapm_mic, .name =3D wname, .kcontrol_news =3D NUL=
L, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mic, .name =3D wname, .kcontrol_news =3D NUL=
L, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM, .event =3D wevent, \
>         .event_flags =3D SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
>  #define SND_SOC_DAPM_HP(wname, wevent) \
> -{      .id =3D snd_soc_dapm_hp, .name =3D wname, .kcontrol_news =3D NULL=
, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_hp, .name =3D wname, .kcontrol_news =3D NULL=
, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM, .event =3D wevent, \
>         .event_flags =3D SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
>  #define SND_SOC_DAPM_SPK(wname, wevent) \
> -{      .id =3D snd_soc_dapm_spk, .name =3D wname, .kcontrol_news =3D NUL=
L, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_spk, .name =3D wname, .kcontrol_news =3D NUL=
L, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM, .event =3D wevent, \
>         .event_flags =3D SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
>  #define SND_SOC_DAPM_LINE(wname, wevent) \
> -{      .id =3D snd_soc_dapm_line, .name =3D wname, .kcontrol_news =3D NU=
LL, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_line, .name =3D wname, .kcontrol_news =3D NU=
LL, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM, .event =3D wevent, \
>         .event_flags =3D SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
>
> @@ -82,93 +91,110 @@ struct soc_enum;
>  /* path domain */
>  #define SND_SOC_DAPM_PGA(wname, wreg, wshift, winvert,\
>          wcontrols, wncontrols) \
> -{      .id =3D snd_soc_dapm_pga, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_pga, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D wncontrols}
>  #define SND_SOC_DAPM_OUT_DRV(wname, wreg, wshift, winvert,\
>          wcontrols, wncontrols) \
> -{      .id =3D snd_soc_dapm_out_drv, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_out_drv, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D wncontrols}
>  #define SND_SOC_DAPM_MIXER(wname, wreg, wshift, winvert, \
>          wcontrols, wncontrols)\
> -{      .id =3D snd_soc_dapm_mixer, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D wncontrols}
>  #define SND_SOC_DAPM_MIXER_NAMED_CTL(wname, wreg, wshift, winvert, \
>          wcontrols, wncontrols)\
> -{       .id =3D snd_soc_dapm_mixer_named_ctl, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer_named_ctl, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D wncontrols}
>  /* DEPRECATED: use SND_SOC_DAPM_SUPPLY */
>  #define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \
> -{      .id =3D snd_soc_dapm_micbias, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_micbias, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D NULL, .num_kcontrols =3D 0}
>  #define SND_SOC_DAPM_SWITCH(wname, wreg, wshift, winvert, wcontrols) \
> -{      .id =3D snd_soc_dapm_switch, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_switch, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D 1}
>  #define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \
> -{      .id =3D snd_soc_dapm_mux, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mux, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D 1}
>  #define SND_SOC_DAPM_DEMUX(wname, wreg, wshift, winvert, wcontrols) \
> -{      .id =3D snd_soc_dapm_demux, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_demux, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D 1}
>
>  /* Simplified versions of above macros, assuming wncontrols =3D ARRAY_SI=
ZE(wcontrols) */
>  #define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\
>          wcontrols) \
> -{      .id =3D snd_soc_dapm_pga, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_pga, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D ARRAY_SIZE(wcont=
rols)}
>  #define SOC_MIXER_ARRAY(wname, wreg, wshift, winvert, \
>          wcontrols)\
> -{      .id =3D snd_soc_dapm_mixer, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D ARRAY_SIZE(wcont=
rols)}
>  #define SOC_MIXER_NAMED_CTL_ARRAY(wname, wreg, wshift, winvert, \
>          wcontrols)\
> -{       .id =3D snd_soc_dapm_mixer_named_ctl, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer_named_ctl, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D ARRAY_SIZE(wcont=
rols)}
>
>  /* path domain with event - event handler must return 0 for success */
>  #define SND_SOC_DAPM_PGA_E(wname, wreg, wshift, winvert, wcontrols, \
>         wncontrols, wevent, wflags) \
> -{      .id =3D snd_soc_dapm_pga, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_pga, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D wncontrols, \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SND_SOC_DAPM_OUT_DRV_E(wname, wreg, wshift, winvert, wcontrols, =
\
>         wncontrols, wevent, wflags) \
> -{      .id =3D snd_soc_dapm_out_drv, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_out_drv, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D wncontrols, \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SND_SOC_DAPM_MIXER_E(wname, wreg, wshift, winvert, wcontrols, \
>         wncontrols, wevent, wflags) \
> -{      .id =3D snd_soc_dapm_mixer, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D wncontrols, \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SND_SOC_DAPM_MIXER_NAMED_CTL_E(wname, wreg, wshift, winvert, \
>         wcontrols, wncontrols, wevent, wflags) \
> -{       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, \
>         .num_kcontrols =3D wncontrols, .event =3D wevent, .event_flags =
=3D wflags}
>  #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \
>         wevent, wflags) \
> -{      .id =3D snd_soc_dapm_switch, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_switch, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D 1, \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
>         wevent, wflags) \
> -{      .id =3D snd_soc_dapm_mux, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mux, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D 1, \
>         .event =3D wevent, .event_flags =3D wflags}
> @@ -176,101 +202,121 @@ struct soc_enum;
>  /* additional sequencing control within an event type */
>  #define SND_SOC_DAPM_PGA_S(wname, wsubseq, wreg, wshift, winvert, \
>         wevent, wflags) \
> -{      .id =3D snd_soc_dapm_pga, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_pga, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .event =3D wevent, .event_flags =3D wflags, \
>         .subseq =3D wsubseq}
>  #define SND_SOC_DAPM_SUPPLY_S(wname, wsubseq, wreg, wshift, winvert, wev=
ent, \
>         wflags) \
> -{      .id =3D snd_soc_dapm_supply, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_supply, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .event =3D wevent, .event_flags =3D wflags, .subseq =3D wsubseq}
>
>  /* Simplified versions of above macros, assuming wncontrols =3D ARRAY_SI=
ZE(wcontrols) */
>  #define SOC_PGA_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \
>         wevent, wflags) \
> -{      .id =3D snd_soc_dapm_pga, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_pga, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D ARRAY_SIZE(wcont=
rols), \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SOC_MIXER_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \
>         wevent, wflags) \
> -{      .id =3D snd_soc_dapm_mixer, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D ARRAY_SIZE(wcont=
rols), \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SOC_MIXER_NAMED_CTL_E_ARRAY(wname, wreg, wshift, winvert, \
>         wcontrols, wevent, wflags) \
> -{       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_mixer, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .kcontrol_news =3D wcontrols, .num_kcontrols =3D ARRAY_SIZE(wcont=
rols), \
>         .event =3D wevent, .event_flags =3D wflags}
>
>  /* events that are pre and post DAPM */
>  #define SND_SOC_DAPM_PRE(wname, wevent) \
> -{      .id =3D snd_soc_dapm_pre, .name =3D wname, .kcontrol_news =3D NUL=
L, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_pre, .name =3D wname, .kcontrol_news =3D NUL=
L, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM, .event =3D wevent, \
>         .event_flags =3D SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}
>  #define SND_SOC_DAPM_POST(wname, wevent) \
> -{      .id =3D snd_soc_dapm_post, .name =3D wname, .kcontrol_news =3D NU=
LL, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_post, .name =3D wname, .kcontrol_news =3D NU=
LL, \
>         .num_kcontrols =3D 0, .reg =3D SND_SOC_NOPM, .event =3D wevent, \
>         .event_flags =3D SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}
>
>  /* stream domain */
>  #define SND_SOC_DAPM_AIF_IN(wname, stname, wchan, wreg, wshift, winvert)=
 \
> -{      .id =3D snd_soc_dapm_aif_in, .name =3D wname, .sname =3D stname, =
\
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_aif_in, .name =3D wname, .sname =3D stname, =
\
>         .channel =3D wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winve=
rt), }
>  #define SND_SOC_DAPM_AIF_IN_E(wname, stname, wchan, wreg, wshift, winver=
t, \
>                               wevent, wflags)                           \
> -{      .id =3D snd_soc_dapm_aif_in, .name =3D wname, .sname =3D stname, =
\
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_aif_in, .name =3D wname, .sname =3D stname, =
\
>         .channel =3D wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winve=
rt), \
>         .event =3D wevent, .event_flags =3D wflags }
>  #define SND_SOC_DAPM_AIF_OUT(wname, stname, wchan, wreg, wshift, winvert=
) \
> -{      .id =3D snd_soc_dapm_aif_out, .name =3D wname, .sname =3D stname,=
 \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_aif_out, .name =3D wname, .sname =3D stname,=
 \
>         .channel =3D wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winve=
rt), }
>  #define SND_SOC_DAPM_AIF_OUT_E(wname, stname, wchan, wreg, wshift, winve=
rt, \
>                              wevent, wflags)                            \
> -{      .id =3D snd_soc_dapm_aif_out, .name =3D wname, .sname =3D stname,=
 \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_aif_out, .name =3D wname, .sname =3D stname,=
 \
>         .channel =3D wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winve=
rt), \
>         .event =3D wevent, .event_flags =3D wflags }
>  #define SND_SOC_DAPM_DAC(wname, stname, wreg, wshift, winvert) \
> -{      .id =3D snd_soc_dapm_dac, .name =3D wname, .sname =3D stname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_dac, .name =3D wname, .sname =3D stname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert) }
>  #define SND_SOC_DAPM_DAC_E(wname, stname, wreg, wshift, winvert, \
>                            wevent, wflags)                              \
> -{      .id =3D snd_soc_dapm_dac, .name =3D wname, .sname =3D stname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_dac, .name =3D wname, .sname =3D stname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .event =3D wevent, .event_flags =3D wflags}
>
>  #define SND_SOC_DAPM_ADC(wname, stname, wreg, wshift, winvert) \
> -{      .id =3D snd_soc_dapm_adc, .name =3D wname, .sname =3D stname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_adc, .name =3D wname, .sname =3D stname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), }
>  #define SND_SOC_DAPM_ADC_E(wname, stname, wreg, wshift, winvert, \
>                            wevent, wflags)                              \
> -{      .id =3D snd_soc_dapm_adc, .name =3D wname, .sname =3D stname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_adc, .name =3D wname, .sname =3D stname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SND_SOC_DAPM_CLOCK_SUPPLY(wname) \
> -{      .id =3D snd_soc_dapm_clock_supply, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_clock_supply, .name =3D wname, \
>         .reg =3D SND_SOC_NOPM, .event =3D dapm_clock_event, \
>         .event_flags =3D SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD }
>
>  /* generic widgets */
>  #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_=
val) \
> -{      .id =3D wid, .name =3D wname, .kcontrol_news =3D NULL, .num_kcont=
rols =3D 0, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D wid, .name =3D wname, .kcontrol_news =3D NULL, .num_kcont=
rols =3D 0, \
>         .reg =3D wreg, .shift =3D wshift, .mask =3D wmask, \
>         .on_val =3D won_val, .off_val =3D woff_val, }
>  #define SND_SOC_DAPM_SUPPLY(wname, wreg, wshift, winvert, wevent, wflags=
) \
> -{      .id =3D snd_soc_dapm_supply, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_supply, .name =3D wname, \
>         SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
>         .event =3D wevent, .event_flags =3D wflags}
>  #define SND_SOC_DAPM_REGULATOR_SUPPLY(wname, wdelay, wflags)       \
> -{      .id =3D snd_soc_dapm_regulator_supply, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_regulator_supply, .name =3D wname, \
>         .reg =3D SND_SOC_NOPM, .shift =3D wdelay, .event =3D dapm_regulat=
or_event, \
>         .event_flags =3D SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD, \
>         .on_val =3D wflags}
>  #define SND_SOC_DAPM_PINCTRL(wname, active, sleep) \
> -{      .id =3D snd_soc_dapm_pinctrl, .name =3D wname, \
> +(struct snd_soc_dapm_widget) { \
> +       .id =3D snd_soc_dapm_pinctrl, .name =3D wname, \
>         .priv =3D (&(struct snd_soc_dapm_pinctrl_priv) \
>                 { .active_state =3D active, .sleep_state =3D sleep,}), \
>         .reg =3D SND_SOC_NOPM, .event =3D dapm_pinctrl_event, \
> --
> 2.40.1
>


--=20
With Best Regards,
Andy Shevchenko