aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-24 13:51:26 -0400
committerMark Brown <broonie@linaro.org>2013-09-24 14:31:17 -0400
commitb07c443fabb97f909c8cc406bfd2d0ecc002bc3b (patch)
tree345898a8b0a36c080cace8b0da532846a65925a7
parent2c142c61f79c14a120c0f4d2954e35b6404b2d0d (diff)
ASoC: tlv320aic23: Convert to table based control init
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/codecs/tlv320aic23.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index 32994597a43f..3a6be8c3d557 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -586,9 +586,6 @@ static int tlv320aic23_probe(struct snd_soc_codec *codec)
586 586
587 snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x1); 587 snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x1);
588 588
589 snd_soc_add_codec_controls(codec, tlv320aic23_snd_controls,
590 ARRAY_SIZE(tlv320aic23_snd_controls));
591
592 return 0; 589 return 0;
593} 590}
594 591
@@ -607,6 +604,8 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = {
607 .suspend = tlv320aic23_suspend, 604 .suspend = tlv320aic23_suspend,
608 .resume = tlv320aic23_resume, 605 .resume = tlv320aic23_resume,
609 .set_bias_level = tlv320aic23_set_bias_level, 606 .set_bias_level = tlv320aic23_set_bias_level,
607 .controls = tlv320aic23_snd_controls,
608 .num_controls = ARRAY_SIZE(tlv320aic23_snd_controls),
610 .dapm_widgets = tlv320aic23_dapm_widgets, 609 .dapm_widgets = tlv320aic23_dapm_widgets,
611 .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets), 610 .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
612 .dapm_routes = tlv320aic23_intercon, 611 .dapm_routes = tlv320aic23_intercon,