diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-08-27 15:50:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-27 15:31:58 +0100 |
| commit | a85f9da707366e856c0aad9e329db0cc59475290 (patch) | |
| tree | 9b325251b6ff03e34636c9ab8f54eeb5e05fc0eb /sound | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
| download | op-kernel-dev-a85f9da707366e856c0aad9e329db0cc59475290.zip op-kernel-dev-a85f9da707366e856c0aad9e329db0cc59475290.tar.gz | |
ASoC: dmic: Convert table based DAPM setup
Let the core take care of instantiating the DAPM widgets and routes, this makes
the code a bit shorter.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/dmic.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index 66967ba..b2090b2 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -50,20 +50,11 @@ static const struct snd_soc_dapm_route intercon[] = { {"DMIC AIF", NULL, "DMic"}, }; -static int dmic_probe(struct snd_soc_codec *codec) -{ - struct snd_soc_dapm_context *dapm = &codec->dapm; - - snd_soc_dapm_new_controls(dapm, dmic_dapm_widgets, - ARRAY_SIZE(dmic_dapm_widgets)); - snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); - snd_soc_dapm_new_widgets(dapm); - - return 0; -} - static struct snd_soc_codec_driver soc_dmic = { - .probe = dmic_probe, + .dapm_widgets = dmic_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), }; static int dmic_dev_probe(struct platform_device *pdev) |
