ASoC: codec duplicated callback function goes to component on rt5616

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/rt5616.c b/sound/soc/codecs/rt5616.c
index f527b5b2817ba4f432766acd677c1e84c23174d5..e92a1490fa68e8144bdf30f8e9bee4c5d0576040 100644 (file)
--- a/sound/soc/codecs/rt5616.c
+++ b/sound/soc/codecs/rt5616.c
@@ -1302,12 +1302,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5616 = {
        .resume = rt5616_resume,
        .set_bias_level = rt5616_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5616_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5616_snd_controls),
-       .dapm_widgets = rt5616_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5616_dapm_widgets),
-       .dapm_routes = rt5616_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5616_dapm_routes),
+       .component_driver = {
+               .controls               = rt5616_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5616_snd_controls),
+               .dapm_widgets           = rt5616_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5616_dapm_widgets),
+               .dapm_routes            = rt5616_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5616_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5616_regmap = {