ASoC: codec duplicated callback function goes to component on rt5640

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/rt5640.c b/sound/soc/codecs/rt5640.c
index 09e8988bbb2d0fb3ddb4fcea1667fe8b56703a39..fbe3af14bd13885c0909ffa626ddc5a8f30950fb 100644 (file)
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2261,12 +2261,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5640 = {
        .resume = rt5640_resume,
        .set_bias_level = rt5640_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5640_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5640_snd_controls),
-       .dapm_widgets = rt5640_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5640_dapm_widgets),
-       .dapm_routes = rt5640_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5640_dapm_routes),
+       .component_driver = {
+               .controls               = rt5640_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5640_snd_controls),
+               .dapm_widgets           = rt5640_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5640_dapm_widgets),
+               .dapm_routes            = rt5640_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5640_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5640_regmap = {