diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 12:59:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-21 17:00:17 +0000 |
| commit | cb555318ca5dd5c1426c7a639aa1e90a88c8f024 (patch) | |
| tree | 117c5de8bfe32088eab7ea551e2545aa741868d3 | |
| parent | 70a28f841d6744c53320c789c2603ac4318649b2 (diff) | |
| download | linux-3.10-cb555318ca5dd5c1426c7a639aa1e90a88c8f024.tar.gz linux-3.10-cb555318ca5dd5c1426c7a639aa1e90a88c8f024.tar.bz2 linux-3.10-cb555318ca5dd5c1426c7a639aa1e90a88c8f024.zip | |
ASoC: Use table based init for wm8731_snd_controls
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/wm8731.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 7e5ec03f6f8..f5161f383fc 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -553,9 +553,6 @@ static int wm8731_probe(struct snd_soc_codec *codec) /* Disable bypass path by default */ snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0); - snd_soc_add_controls(codec, wm8731_snd_controls, - ARRAY_SIZE(wm8731_snd_controls)); - /* Regulators will have been enabled by bias management */ regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); @@ -595,6 +592,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets), .dapm_routes = wm8731_intercon, .num_dapm_routes = ARRAY_SIZE(wm8731_intercon), + .controls = wm8731_snd_controls, + .num_controls = ARRAY_SIZE(wm8731_snd_controls), }; static const struct of_device_id wm8731_of_match[] = { |