summary refs log tree commit diff
path: root/sound/soc/codecs/wm5102.c
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.wolfsonmicro.com>2015-06-11 11:32:31 +0100
committerMark Brown <broonie@kernel.org>2015-06-11 11:39:39 +0100
commit218e508784b6d4d047fa25ce45761043c6840fec (patch)
tree71ac8a5c19e10663e490b5206ebbad5d05801676 /sound/soc/codecs/wm5102.c
parentf5e2ce92bd96df99de1ef33fad05e3b3b2d34e54 (diff)
downloadlinux-218e508784b6d4d047fa25ce45761043c6840fec.tar.gz
ASoC: wm_adsp: create ALSA controls from wm_adsp driver
Now that we have a codec_probe stage initialization in the wm_adsp
driver, we can make the wm_adsp driver create its own ALSA controls
instead of having that responsibility pushed to every codec driver.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
-rw-r--r--sound/soc/codecs/wm5102.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 341d96e3376c..872c2ad88fb7 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1879,10 +1879,6 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
 	if (ret)
 		return ret;
 
-	ret = snd_soc_add_codec_controls(codec, wm_adsp2_fw_controls, 2);
-	if (ret != 0)
-		return ret;
-
 	arizona_init_spk(codec);
 	arizona_init_gpio(codec);