ASoC: codec duplicated callback function goes to component on da7218

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/da7218.c b/sound/soc/codecs/da7218.c
index 99ce23e113bf74804e671642e5d836a8ea273157..dcdda6c15cf7e5b31ab4cead665a12581e3b4a13 100644 (file)
--- a/sound/soc/codecs/da7218.c
+++ b/sound/soc/codecs/da7218.c
@@ -3045,13 +3045,14 @@ static struct snd_soc_codec_driver soc_codec_dev_da7218 = {
        .resume                 = da7218_resume,
        .set_bias_level         = da7218_set_bias_level,
 
-       .controls               = da7218_snd_controls,
-       .num_controls           = ARRAY_SIZE(da7218_snd_controls),
-
-       .dapm_widgets           = da7218_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(da7218_dapm_widgets),
-       .dapm_routes            = da7218_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(da7218_audio_map),
+       .component_driver = {
+               .controls               = da7218_snd_controls,
+               .num_controls           = ARRAY_SIZE(da7218_snd_controls),
+               .dapm_widgets           = da7218_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(da7218_dapm_widgets),
+               .dapm_routes            = da7218_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(da7218_audio_map),
+       },
 };