ASoC: codec duplicated callback function goes to component on rt5651

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/rt5651.c b/sound/soc/codecs/rt5651.c
index 7a6197042423b6713ed8e38f72b47922c8d34bc7..f5d34153e21fc4cf10c3e9d45436ad9e14efa166 100644 (file)
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1712,12 +1712,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5651 = {
        .resume = rt5651_resume,
        .set_bias_level = rt5651_set_bias_level,
        .idle_bias_off = true,
-       .controls = rt5651_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5651_snd_controls),
-       .dapm_widgets = rt5651_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5651_dapm_widgets),
-       .dapm_routes = rt5651_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5651_dapm_routes),
+       .component_driver = {
+               .controls               = rt5651_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5651_snd_controls),
+               .dapm_widgets           = rt5651_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5651_dapm_widgets),
+               .dapm_routes            = rt5651_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5651_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5651_regmap = {