ASoC: codec duplicated callback function goes to component on rt5670

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/rt5670.c b/sound/soc/codecs/rt5670.c
index 8ef467f..49caf13 100644 (file)
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -2777,12 +2777,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5670 = {
        .resume = rt5670_resume,
        .set_bias_level = rt5670_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5670_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5670_snd_controls),
-       .dapm_widgets = rt5670_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5670_dapm_widgets),
-       .dapm_routes = rt5670_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5670_dapm_routes),
+       .component_driver = {
+               .controls               = rt5670_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5670_snd_controls),
+               .dapm_widgets           = rt5670_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5670_dapm_widgets),
+               .dapm_routes            = rt5670_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5670_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5670_regmap = {