[PATCH 3/4] ASoC: sun8i-codec: Convert to SOC_MIXER_ARRAY

From	Mylène Josserand <mylene.josserand@free-electrons.com>
Newsgroups	linux.kernel
Subject	[PATCH 3/4] ASoC: sun8i-codec: Convert to SOC_MIXER_ARRAY
Date	2017-02-10 10:50 +0100
Message-ID	<t9g02-1Hw-41@gated-at.bofh.it> (permalink)
References	<t9g01-1Hw-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

SOC_MIXER_ARRAY is a simplified function of SND_SOC_DAPM_MIXER
which handles automatically the ARRAY_SIZE of controls.

Update the driver to use SOC_MIXER_ARRAY.

Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
---
 sound/soc/sunxi/sun8i-codec.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 107fa8213600..a75a983974d9 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -288,12 +288,10 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
 			 SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
 
 	/* DAC Mixers */
-	SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
-			   sun8i_dac_mixer_controls,
-			   ARRAY_SIZE(sun8i_dac_mixer_controls)),
-	SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
-			   sun8i_dac_mixer_controls,
-			   ARRAY_SIZE(sun8i_dac_mixer_controls)),
+	SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
+			sun8i_dac_mixer_controls),
+	SOC_MIXER_ARRAY("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
+			sun8i_dac_mixer_controls),
 
 	/* Clocks */
 	SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA,
-- 
2.11.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 3/4] ASoC: sun8i-codec: Convert to SOC_MIXER_ARRAY Mylène Josserand          <mylene.josserand@free-electrons.com> - 2017-02-10 10:50 +0100
  Re: [PATCH 3/4] ASoC: sun8i-codec: Convert to SOC_MIXER_ARRAY Chen-Yu Tsai <wens@csie.org> - 2017-02-12 07:50 +0100

csiph-web