]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: codec duplicated callback function goes to component on ac97
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:08:06 +0000 (09:08 +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/ac97.c

index 5b3224c6394312cfebe9cf933f40451ee73fdb01..f7f04c6be01e78402e6901fe14ed35fa7754921b 100644 (file)
@@ -117,10 +117,12 @@ static struct snd_soc_codec_driver soc_codec_dev_ac97 = {
        .suspend =      ac97_soc_suspend,
        .resume =       ac97_soc_resume,
 
-       .dapm_widgets = ac97_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ac97_widgets),
-       .dapm_routes = ac97_routes,
-       .num_dapm_routes = ARRAY_SIZE(ac97_routes),
+       .component_driver = {
+               .dapm_widgets           = ac97_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ac97_widgets),
+               .dapm_routes            = ac97_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ac97_routes),
+       },
 };
 
 static int ac97_probe(struct platform_device *pdev)