diff options
| author | Richard Fitzgerald <rf@opensource.wolfsonmicro.com> | 2015-06-11 12:32:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-11 12:39:39 +0200 |
| commit | 218e508784b6d4d047fa25ce45761043c6840fec (patch) | |
| tree | 71ac8a5c19e10663e490b5206ebbad5d05801676 /sound/soc/codecs/wm5110.c | |
| parent | ASoC: wm_adsp: Add codec_probe and codec_remove stubs (diff) | |
| download | linux-218e508784b6d4d047fa25ce45761043c6840fec.tar.xz linux-218e508784b6d4d047fa25ce45761043c6840fec.zip | |
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/wm5110.c')
| -rw-r--r-- | sound/soc/codecs/wm5110.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 6e15d9c7ec23..ce7de949a506 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -1613,10 +1613,6 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) return ret; } - ret = snd_soc_add_codec_controls(codec, wm_adsp2_fw_controls, 8); - if (ret != 0) - return ret; - snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS"); priv->core.arizona->dapm = &codec->dapm; |