Commit 8484c63f authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mark Brown
Browse files

ASoC: add simplified versions of widget macros 



Many macros from include/sound/soc-dapm.h take an array and a number of
elements in it as arguments, whereas most users use static arrays and use
"x, ARRAY_SIZE(x)" as arguments. This patch adds simplified versions of
those macros, calling ARRAY_SIZE() internally.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.oc.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 821dd91e

include/sound/soc-dapm.h

+32 −0
Original line number Diff line number Diff line
@@ -95,6 +95,21 @@ 
	.shift = wshift, .invert = winvert, .kcontrols = 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, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = ARRAY_SIZE(wcontrols)}

#define SOC_MIXER_ARRAY(wname, wreg, wshift, winvert, \

	 wcontrols)\

{	.id = snd_soc_dapm_mixer, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = 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, .reg = wreg, \

	.shift = wshift, .invert = winvert, .kcontrols = 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) \
@@ -126,6 +141,23 @@ 
	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = wflags}



/* 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, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = 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, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = 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, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = 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, .kcontrols = NULL, \

CRA Git | Maintained and supported by SUSTech CRA and CCSE