ASoC: codec duplicated callback function goes to component on rt5514

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/rt5514.c b/sound/soc/codecs/rt5514.c
index 7162f05..e0606a5 100644 (file)
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -1023,12 +1023,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5514 = {
        .probe = rt5514_probe,
        .idle_bias_off = true,
        .set_bias_level = rt5514_set_bias_level,
-       .controls = rt5514_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5514_snd_controls),
-       .dapm_widgets = rt5514_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5514_dapm_widgets),
-       .dapm_routes = rt5514_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5514_dapm_routes),
+       .component_driver = {
+               .controls               = rt5514_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5514_snd_controls),
+               .dapm_widgets           = rt5514_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5514_dapm_widgets),
+               .dapm_routes            = rt5514_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5514_dapm_routes),
+       },
 };
 
 static const struct regmap_config rt5514_i2c_regmap = {