ASoC: codec duplicated callback function goes to component on wm8782
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:31:09 +0000 (09:31 +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/wm8782.c

index fb55fd845d273fc9fa41670e41568379f346e9ec..1e9c4953dc1088dcf8884c13e1f719d97f3da24b 100644 (file)
@@ -51,10 +51,12 @@ static struct snd_soc_dai_driver wm8782_dai = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_wm8782 = {
-       .dapm_widgets = wm8782_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8782_dapm_widgets),
-       .dapm_routes = wm8782_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8782_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = wm8782_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8782_dapm_widgets),
+               .dapm_routes            = wm8782_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8782_dapm_routes),
+       },
 };
 
 static int wm8782_probe(struct platform_device *pdev)