From nobody Wed Dec 17 10:01:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12D64C001DD for ; Fri, 23 Jun 2023 09:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231855AbjFWJAI (ORCPT ); Fri, 23 Jun 2023 05:00:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232075AbjFWI7c (ORCPT ); Fri, 23 Jun 2023 04:59:32 -0400 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::224]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DC83294F; Fri, 23 Jun 2023 01:59:03 -0700 (PDT) X-GND-Sasl: herve.codina@bootlin.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1687510742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kVNcNG6lGwmhGkvgIcyEWY+MHma3vPNVL1G9SDQv0N4=; b=NFa8AHoKRE12t09DpcXaVFTI8PO3edG9JnWGegP3OkV+14qrVfmrQHlJ6NJ+TpuxwzLVA6 f7KT4l3NLQeVGnpM0/hpHFDZ5njd6Osa68j78+2RbRhMTCmyWII/7X2ikwdlZnWMgg/2QC Nzbb0+JPJkXRxh9TBkhI2sioMXEF+sW7V9Rv9rbndl32ZkTPda4l6ghWVmd4pP/uZCFfr8 K8aQJgJ3hgvnrESCgsgDcJ4I0Rdzaj6GwviIUsjbyhP5W7CQRjOfwBKhcGRq0c8BtO9ia5 MT4SCCM0IzJ22na3KD7kOfn8AkKoc1LGUc2R4z+DPoGFuJpP4o7cdEsf3DdOOQ== X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com X-GND-Sasl: herve.codina@bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPA id A2F02E0008; Fri, 23 Jun 2023 08:59:00 +0000 (UTC) From: Herve Codina To: Herve Codina , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jonathan Cameron , Lars-Peter Clausen , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto , Andy Shevchenko Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Wojciech Ziemba , Christophe Leroy , Thomas Petazzoni Subject: [PATCH v6 11/13] ASoC: soc-dapm.h: Convert macros to return a compound literal Date: Fri, 23 Jun 2023 10:58:28 +0200 Message-Id: <20230623085830.749991-12-herve.codina@bootlin.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230623085830.749991-1-herve.codina@bootlin.com> References: <20230623085830.749991-1-herve.codina@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The SND_SOC_DAPM_* helpers family are used to build widgets array in a static way. Convert them to return a compound literal in order to use them in both 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); ... } Signed-off-by: Herve Codina Suggested-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Reviewed-by: Christophe Leroy --- 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; =20 /* codec domain */ #define SND_SOC_DAPM_VMID(wname) \ -{ .id =3D snd_soc_dapm_vmid, .name =3D wname, .kcontrol_news =3D NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_vmid, .name =3D wname, .kcontrol_news =3D NULL, \ .num_kcontrols =3D 0} =20 /* 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 NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_sink, .name =3D wname, .kcontrol_news =3D NULL, \ .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 NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_input, .name =3D wname, .kcontrol_news =3D NULL, \ .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 NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_mic, .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_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 NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_spk, .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_LINE(wname, wevent) \ -{ .id =3D snd_soc_dapm_line, .name =3D wname, .kcontrol_news =3D NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_line, .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} =20 @@ -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} =20 /* Simplified versions of above macros, assuming wncontrols =3D ARRAY_SIZE= (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(wcontrols)} #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(wcontrols)} #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(wcontrols)} =20 /* 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, weven= t, \ 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} =20 /* Simplified versions of above macros, assuming wncontrols =3D ARRAY_SIZE= (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(wcontrols), \ .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(wcontrols), \ .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(wcontrols), \ .event =3D wevent, .event_flags =3D wflags} =20 /* 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 NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_pre, .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_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 NULL, \ +(struct snd_soc_dapm_widget) { \ + .id =3D snd_soc_dapm_post, .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_POST_PMD} =20 /* 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, winvert), } #define SND_SOC_DAPM_AIF_IN_E(wname, stname, wchan, wreg, wshift, winvert,= \ 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, winvert), \ .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, winvert), } #define SND_SOC_DAPM_AIF_OUT_E(wname, stname, wchan, wreg, wshift, winvert= , \ 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, winvert), \ .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} =20 #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 } =20 /* generic widgets */ #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_va= l) \ -{ .id =3D wid, .name =3D wname, .kcontrol_news =3D NULL, .num_kcontrols = =3D 0, \ +(struct snd_soc_dapm_widget) { \ + .id =3D wid, .name =3D wname, .kcontrol_news =3D NULL, .num_kcontrols =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_regulator_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, \ --=20 2.40.1