commit f9df1ae6b59e5bb16d3094e9c1c8b6feeaf32aae
author Mark Brown <broonie@linaro.org> Mon Sep 23 23:53:16 2013 +0100
committer Mark Brown <broonie@linaro.org> Tue Sep 24 19:32:56 2013 +0100
tree 46fe5a71482222a1d3af64dec62f33514a3797f9
parent 6f818e04fc8d3d413eeb3a689c7607f2a89ab568

ASoC: tlv320aic3x: Move to table based control init

Signed-off-by: Mark Brown <broonie@linaro.org>

sound/soc/codecs/tlv320aic3x.c

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index de17a36..397a213 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1369,8 +1369,6 @@
 			      (aic3x->setup->gpio_func[1] & 0xf) << 4);
 	}
 
-	snd_soc_add_codec_controls(codec, aic3x_snd_controls,
-			     ARRAY_SIZE(aic3x_snd_controls));
 	if (aic3x->model == AIC3X_MODEL_3007)
 		snd_soc_add_codec_controls(codec, &aic3x_classd_amp_gain_ctrl, 1);
 
@@ -1428,6 +1426,8 @@
 	.remove = aic3x_remove,
 	.suspend = aic3x_suspend,
 	.resume = aic3x_resume,
+	.controls = aic3x_snd_controls,
+	.num_controls = ARRAY_SIZE(aic3x_snd_controls),
 };
 
 /*