summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMylène Josserand <mylene.josserand@free-electrons.com>2017-02-10 10:41:32 +0100
committerMark Brown <broonie@kernel.org>2017-03-08 14:17:53 +0100
commitfa22ca4f905d7001ed966bc95bcffb890a1b8d73 (patch)
tree61cff97952167d213a33eade749baea27c3fcead /sound/soc
parentca14da6e611674cad275f29ac2aaf1e2eb427c6b (diff)
downloadop-kernel-dev-fa22ca4f905d7001ed966bc95bcffb890a1b8d73.zip
op-kernel-dev-fa22ca4f905d7001ed966bc95bcffb890a1b8d73.tar.gz
ASoC: sun8i-codec: Convert to SOC_MIXER_ARRAY
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> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/sunxi/sun8i-codec.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 107fa82..a75a983 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,
OpenPOWER on IntegriCloud