diff options
| author | Mark Brown | 2013-09-24 00:53:16 +0200 |
|---|---|---|
| committer | Mark Brown | 2013-09-24 20:32:56 +0200 |
| commit | f9df1ae6b59e5bb16d3094e9c1c8b6feeaf32aae (patch) | |
| tree | 46fe5a71482222a1d3af64dec62f33514a3797f9 /sound/soc/codecs/tlv320aic3x.c | |
| parent | ASoC: tlv320aic3x: Move resource acquisition to I2C probe (diff) | |
| download | kernel-qcow2-linux-f9df1ae6b59e5bb16d3094e9c1c8b6feeaf32aae.tar.gz kernel-qcow2-linux-f9df1ae6b59e5bb16d3094e9c1c8b6feeaf32aae.tar.xz kernel-qcow2-linux-f9df1ae6b59e5bb16d3094e9c1c8b6feeaf32aae.zip | |
ASoC: tlv320aic3x: Move to table based control init
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index de17a36beb6f..397a2133e2d1 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1369,8 +1369,6 @@ static int aic3x_probe(struct snd_soc_codec *codec) (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 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = { .remove = aic3x_remove, .suspend = aic3x_suspend, .resume = aic3x_resume, + .controls = aic3x_snd_controls, + .num_controls = ARRAY_SIZE(aic3x_snd_controls), }; /* |