[1/2] ASoC: ak4671: Convert to table based control init
diff mbox

Message ID 1392148618-24830-1-git-send-email-broonie@kernel.org
State Accepted
Commit 78c51bc6475982a843947a556853affd2c360b19
Headers show

Commit Message

Mark Brown Feb. 11, 2014, 7:56 p.m. UTC
From: Mark Brown <broonie@linaro.org>

Saves code and adds error handling.

Signed-off-by: Mark Brown <broonie@linaro.org>
---
 sound/soc/codecs/ak4671.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch
diff mbox

diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 25bdf6ad4a54..456bd0a065b1 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -628,9 +628,6 @@  static int ak4671_probe(struct snd_soc_codec *codec)
 		return ret;
 	}
 
-	snd_soc_add_codec_controls(codec, ak4671_snd_controls,
-			     ARRAY_SIZE(ak4671_snd_controls));
-
 	ak4671_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
 	return ret;
@@ -646,6 +643,8 @@  static struct snd_soc_codec_driver soc_codec_dev_ak4671 = {
 	.probe = ak4671_probe,
 	.remove = ak4671_remove,
 	.set_bias_level = ak4671_set_bias_level,
+	.controls = ak4671_snd_controls,
+	.num_controls = ARRAY_SIZE(ak4671_snd_controls),
 	.reg_cache_size = AK4671_CACHEREGNUM,
 	.reg_word_size = sizeof(u8),
 	.reg_cache_default = ak4671_reg,