Re: [PATCH v3 10/12] ASoC: soc-dapm.h: Convert macros to return a compound litteral

12 Jun 2023

On Mon, Jun 12, 2023 at 3:30 PM 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 = input_name;
          if (!name)
                  name = "default";
      widget = 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 = snd_soc_dapm_vmid, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_vmid, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0}




/* platform domain */
 #define SND_SOC_DAPM_SIGGEN(wname) \
-{      .id = snd_soc_dapm_siggen, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_siggen, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM }



#define SND_SOC_DAPM_SINK(wname) \
-{      .id = snd_soc_dapm_sink, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_sink, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM }



#define SND_SOC_DAPM_INPUT(wname) \
-{      .id = snd_soc_dapm_input, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_input, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM }



#define SND_SOC_DAPM_OUTPUT(wname) \
-{      .id = snd_soc_dapm_output, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_output, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM }



#define SND_SOC_DAPM_MIC(wname, wevent) \
-{      .id = snd_soc_dapm_mic, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mic, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
  .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}



#define SND_SOC_DAPM_HP(wname, wevent) \
-{      .id = snd_soc_dapm_hp, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_hp, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
  .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}



#define SND_SOC_DAPM_SPK(wname, wevent) \
-{      .id = snd_soc_dapm_spk, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_spk, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
  .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}



#define SND_SOC_DAPM_LINE(wname, wevent) \
-{      .id = snd_soc_dapm_line, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_line, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
  .event_flags = 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 = snd_soc_dapm_pga, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_pga, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}



#define SND_SOC_DAPM_OUT_DRV(wname, wreg, wshift, winvert,\
         wcontrols, wncontrols) \
-{      .id = snd_soc_dapm_out_drv, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_out_drv, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}



#define SND_SOC_DAPM_MIXER(wname, wreg, wshift, winvert, \
         wcontrols, wncontrols)\
-{      .id = snd_soc_dapm_mixer, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}



#define SND_SOC_DAPM_MIXER_NAMED_CTL(wname, wreg, wshift, winvert, \
         wcontrols, wncontrols)\
-{       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer_named_ctl, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = wncontrols}



/* DEPRECATED: use SND_SOC_DAPM_SUPPLY */
 #define SND_SOC_DAPM_MICBIAS(wname, wreg, wshift, winvert) \
-{      .id = snd_soc_dapm_micbias, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_micbias, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = NULL, .num_kcontrols = 0}



#define SND_SOC_DAPM_SWITCH(wname, wreg, wshift, winvert, wcontrols) \
-{      .id = snd_soc_dapm_switch, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_switch, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = 1}



#define SND_SOC_DAPM_MUX(wname, wreg, wshift, winvert, wcontrols) \
-{      .id = snd_soc_dapm_mux, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mux, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = 1}



#define SND_SOC_DAPM_DEMUX(wname, wreg, wshift, winvert, wcontrols) \
-{      .id = snd_soc_dapm_demux, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_demux, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = 1}




/* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */
 #define SOC_PGA_ARRAY(wname, wreg, wshift, winvert,\
         wcontrols) \
-{      .id = snd_soc_dapm_pga, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_pga, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}



#define SOC_MIXER_ARRAY(wname, wreg, wshift, winvert, \
         wcontrols)\
-{      .id = snd_soc_dapm_mixer, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}



#define SOC_MIXER_NAMED_CTL_ARRAY(wname, wreg, wshift, winvert, \
         wcontrols)\
-{       .id = snd_soc_dapm_mixer_named_ctl, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer_named_ctl, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}




/* 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 = snd_soc_dapm_pga, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_pga, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \
  .event = wevent, .event_flags = wflags}



#define SND_SOC_DAPM_OUT_DRV_E(wname, wreg, wshift, winvert, wcontrols, \
        wncontrols, wevent, wflags) \
-{      .id = snd_soc_dapm_out_drv, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_out_drv, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \
  .event = wevent, .event_flags = wflags}



#define SND_SOC_DAPM_MIXER_E(wname, wreg, wshift, winvert, wcontrols, \
        wncontrols, wevent, wflags) \
-{      .id = snd_soc_dapm_mixer, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = wncontrols, \
  .event = wevent, .event_flags = wflags}



#define SND_SOC_DAPM_MIXER_NAMED_CTL_E(wname, wreg, wshift, winvert, \
        wcontrols, wncontrols, wevent, wflags) \
-{       .id = snd_soc_dapm_mixer, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, \
  .num_kcontrols = wncontrols, .event = wevent, .event_flags = wflags}



#define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \
        wevent, wflags) \
-{      .id = snd_soc_dapm_switch, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_switch, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = 1, \
  .event = wevent, .event_flags = wflags}



#define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \
        wevent, wflags) \
-{      .id = snd_soc_dapm_mux, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mux, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = 1, \
  .event = wevent, .event_flags = 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 = snd_soc_dapm_pga, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_pga, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .event = wevent, .event_flags = wflags, \
  .subseq = wsubseq}



#define SND_SOC_DAPM_SUPPLY_S(wname, wsubseq, wreg, wshift, winvert, wevent, \
        wflags) \
-{      .id = snd_soc_dapm_supply, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_supply, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .event = wevent, .event_flags = wflags, .subseq = wsubseq}




/* Simplified versions of above macros, assuming wncontrols = ARRAY_SIZE(wcontrols) */
 #define SOC_PGA_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \
        wevent, wflags) \
-{      .id = snd_soc_dapm_pga, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_pga, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \
  .event = wevent, .event_flags = wflags}



#define SOC_MIXER_E_ARRAY(wname, wreg, wshift, winvert, wcontrols, \
        wevent, wflags) \
-{      .id = snd_soc_dapm_mixer, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \
  .event = wevent, .event_flags = wflags}



#define SOC_MIXER_NAMED_CTL_E_ARRAY(wname, wreg, wshift, winvert, \
        wcontrols, wevent, wflags) \
-{       .id = snd_soc_dapm_mixer, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_mixer, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .kcontrol_news = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols), \
  .event = wevent, .event_flags = wflags}




/* events that are pre and post DAPM */
 #define SND_SOC_DAPM_PRE(wname, wevent) \
-{      .id = snd_soc_dapm_pre, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_pre, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
  .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}



#define SND_SOC_DAPM_POST(wname, wevent) \
-{      .id = snd_soc_dapm_post, .name = wname, .kcontrol_news = NULL, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_post, .name = wname, .kcontrol_news = NULL, \
  .num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
  .event_flags = 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 = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \
  .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), }



#define SND_SOC_DAPM_AIF_IN_E(wname, stname, wchan, wreg, wshift, winvert, \
                              wevent, wflags)                           \
-{      .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \
  .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .event = wevent, .event_flags = wflags }



#define SND_SOC_DAPM_AIF_OUT(wname, stname, wchan, wreg, wshift, winvert) \
-{      .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \
  .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), }



#define SND_SOC_DAPM_AIF_OUT_E(wname, stname, wchan, wreg, wshift, winvert, \
                             wevent, wflags)                            \
-{      .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \
  .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .event = wevent, .event_flags = wflags }



#define SND_SOC_DAPM_DAC(wname, stname, wreg, wshift, winvert) \
-{      .id = snd_soc_dapm_dac, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_dac, .name = wname, .sname = stname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert) }



#define SND_SOC_DAPM_DAC_E(wname, stname, wreg, wshift, winvert, \
                           wevent, wflags)                              \
-{      .id = snd_soc_dapm_dac, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_dac, .name = wname, .sname = stname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .event = wevent, .event_flags = wflags}




#define SND_SOC_DAPM_ADC(wname, stname, wreg, wshift, winvert) \
-{      .id = snd_soc_dapm_adc, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_adc, .name = wname, .sname = stname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), }



#define SND_SOC_DAPM_ADC_E(wname, stname, wreg, wshift, winvert, \
                           wevent, wflags)                              \
-{      .id = snd_soc_dapm_adc, .name = wname, .sname = stname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_adc, .name = wname, .sname = stname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .event = wevent, .event_flags = wflags}



#define SND_SOC_DAPM_CLOCK_SUPPLY(wname) \
-{      .id = snd_soc_dapm_clock_supply, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_clock_supply, .name = wname, \
  .reg = SND_SOC_NOPM, .event = dapm_clock_event, \
  .event_flags = 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 = wid, .name = wname, .kcontrol_news = NULL, .num_kcontrols = 0, \
+(struct snd_soc_dapm_widget) { \

  .id = wid, .name = wname, .kcontrol_news = NULL, .num_kcontrols = 0, \
  .reg = wreg, .shift = wshift, .mask = wmask, \
  .on_val = won_val, .off_val = woff_val, }



#define SND_SOC_DAPM_SUPPLY(wname, wreg, wshift, winvert, wevent, wflags) \
-{      .id = snd_soc_dapm_supply, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_supply, .name = wname, \
  SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \
  .event = wevent, .event_flags = wflags}



#define SND_SOC_DAPM_REGULATOR_SUPPLY(wname, wdelay, wflags)       \
-{      .id = snd_soc_dapm_regulator_supply, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_regulator_supply, .name = wname, \
  .reg = SND_SOC_NOPM, .shift = wdelay, .event = dapm_regulator_event, \
  .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD, \
  .on_val = wflags}



#define SND_SOC_DAPM_PINCTRL(wname, active, sleep) \
-{      .id = snd_soc_dapm_pinctrl, .name = wname, \
+(struct snd_soc_dapm_widget) { \

  .id = snd_soc_dapm_pinctrl, .name = wname, \
  .priv = (&(struct snd_soc_dapm_pinctrl_priv) \
          { .active_state = active, .sleep_state = sleep,}), \
  .reg = SND_SOC_NOPM, .event = dapm_pinctrl_event, \



--
2.40.1
-- 
With Best Regards,
Andy Shevchenko

    