ASoC: codec duplicated callback function goes to component on dmic
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:16:22 +0000 (09:16 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Aug 2016 10:57:57 +0000 (11:57 +0100)
codec driver and component driver has duplicated callback functions,
and codec side functions are just copied to component side when
register timing. This was quick-hack, but no longer needed.
This patch moves these functions from codec driver to component driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/dmic.c

index fde53251c0474ce4148dccc77094af40012774ea..c82b9dc41e9a2b8ab2a3358ca96abc21dfd639cd 100644 (file)
@@ -51,10 +51,12 @@ static const struct snd_soc_dapm_route intercon[] = {
 };
 
 static struct snd_soc_codec_driver soc_dmic = {
-       .dapm_widgets = dmic_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets),
-       .dapm_routes = intercon,
-       .num_dapm_routes = ARRAY_SIZE(intercon),
+       .component_driver = {
+               .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)