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

index f54fb46b77c2f767896a6fb7b7b2ca7bf3c16598..c65b917598d2e20e7a93f3759c86e1f59bdf15f4 100644 (file)
@@ -489,12 +489,14 @@ static struct snd_soc_codec_driver soc_codec_dev_tas5720 = {
        .suspend = tas5720_suspend,
        .resume = tas5720_resume,
 
-       .controls = tas5720_snd_controls,
-       .num_controls = ARRAY_SIZE(tas5720_snd_controls),
-       .dapm_widgets = tas5720_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(tas5720_dapm_widgets),
-       .dapm_routes = tas5720_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(tas5720_audio_map),
+       .component_driver = {
+               .controls               = tas5720_snd_controls,
+               .num_controls           = ARRAY_SIZE(tas5720_snd_controls),
+               .dapm_widgets           = tas5720_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(tas5720_dapm_widgets),
+               .dapm_routes            = tas5720_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(tas5720_audio_map),
+       },
 };
 
 /* PCM rates supported by the TAS5720 driver */