ASoC: codec duplicated callback function goes to component on da7210

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/da7210.c b/sound/soc/codecs/da7210.c
index af23a61b7b283aacd7a8950b5b42cd440151d843..17053dfc94cf07cafea279351d8382db829add1b 100644 (file)
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -1167,13 +1167,14 @@ static int da7210_probe(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_da7210 = {
        .probe                  = da7210_probe,
 
-       .controls               = da7210_snd_controls,
-       .num_controls           = ARRAY_SIZE(da7210_snd_controls),
-
-       .dapm_widgets           = da7210_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(da7210_dapm_widgets),
-       .dapm_routes            = da7210_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(da7210_audio_map),
+       .component_driver = {
+               .controls               = da7210_snd_controls,
+               .num_controls           = ARRAY_SIZE(da7210_snd_controls),
+               .dapm_widgets           = da7210_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(da7210_dapm_widgets),
+               .dapm_routes            = da7210_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(da7210_audio_map),
+       },
 };
 
 #if IS_ENABLED(CONFIG_I2C)