]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: codec duplicated callback function goes to component on pcm3008
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:21:02 +0000 (09:21 +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/pcm3008.c

index 8fb445f33f6f2a23c0d30f15c37ef590609c91cc..708af05486f634012da081f78421b676b21d1f7c 100644 (file)
@@ -99,10 +99,12 @@ static struct snd_soc_dai_driver pcm3008_dai = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_pcm3008 = {
-       .dapm_widgets = pcm3008_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(pcm3008_dapm_widgets),
-       .dapm_routes = pcm3008_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(pcm3008_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = pcm3008_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(pcm3008_dapm_widgets),
+               .dapm_routes            = pcm3008_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(pcm3008_dapm_routes),
+       },
 };
 
 static int pcm3008_codec_probe(struct platform_device *pdev)