ASoC: codec duplicated callback function goes to component on rt5677

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/rt5677.c b/sound/soc/codecs/rt5677.c
index da9483c..68268f2 100644 (file)
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -4974,12 +4974,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5677 = {
        .resume = rt5677_resume,
        .set_bias_level = rt5677_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5677_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5677_snd_controls),
-       .dapm_widgets = rt5677_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5677_dapm_widgets),
-       .dapm_routes = rt5677_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5677_dapm_routes),
+       .component_driver = {
+               .controls               = rt5677_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5677_snd_controls),
+               .dapm_widgets           = rt5677_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5677_dapm_widgets),
+               .dapm_routes            = rt5677_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5677_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5677_regmap_physical = {