ASoC: codec duplicated callback function goes to component on adau1701

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>

diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c
index de53c0d7bf101fd449e596fbf40cf8bf89e639c2..3bad1bc8c00a3d93d74c6f419c96f30a479e4afb 100644 (file)
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -765,13 +765,14 @@ static struct snd_soc_codec_driver adau1701_codec_drv = {
        .set_bias_level         = adau1701_set_bias_level,
        .idle_bias_off          = true,
 
-       .controls               = adau1701_controls,
-       .num_controls           = ARRAY_SIZE(adau1701_controls),
-       .dapm_widgets           = adau1701_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(adau1701_dapm_widgets),
-       .dapm_routes            = adau1701_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(adau1701_dapm_routes),
-
+       .component_driver = {
+               .controls               = adau1701_controls,
+               .num_controls           = ARRAY_SIZE(adau1701_controls),
+               .dapm_widgets           = adau1701_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(adau1701_dapm_widgets),
+               .dapm_routes            = adau1701_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(adau1701_dapm_routes),
+       },
        .set_sysclk             = adau1701_set_sysclk,
 };