Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: tlv320aic26: Convert to table based control init

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

+3 -7
+3 -7
sound/soc/codecs/tlv320aic26.c
··· 377 377 static int aic26_probe(struct snd_soc_codec *codec) 378 378 { 379 379 struct aic26 *aic26 = dev_get_drvdata(codec->dev); 380 - int ret, err, i, reg; 380 + int ret, i, reg; 381 381 382 382 aic26->codec = codec; 383 383 ··· 403 403 if (ret) 404 404 dev_info(codec->dev, "error creating sysfs files\n"); 405 405 406 - /* register controls */ 407 - dev_dbg(codec->dev, "Registering controls\n"); 408 - err = snd_soc_add_codec_controls(codec, aic26_snd_controls, 409 - ARRAY_SIZE(aic26_snd_controls)); 410 - WARN_ON(err < 0); 411 - 412 406 return 0; 413 407 } 414 408 ··· 412 418 .write = aic26_reg_write, 413 419 .reg_cache_size = AIC26_NUM_REGS, 414 420 .reg_word_size = sizeof(u16), 421 + .controls = aic26_snd_controls, 422 + .num_controls = ARRAY_SIZE(aic26_snd_controls), 415 423 .dapm_widgets = tlv320aic26_dapm_widgets, 416 424 .num_dapm_widgets = ARRAY_SIZE(tlv320aic26_dapm_widgets), 417 425 .dapm_routes = tlv320aic26_dapm_routes,