ASoC: codec duplicated callback function goes to component on cs47l24

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/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 954a4f5d3338c5c96b137296e16e10042e67795f..779a7bfff1c34c88aabd3c9c5e9f3aa7a99264c4 100644 (file)
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -1190,12 +1190,14 @@ static struct snd_soc_codec_driver soc_codec_dev_cs47l24 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = cs47l24_set_fll,
 
-       .controls = cs47l24_snd_controls,
-       .num_controls = ARRAY_SIZE(cs47l24_snd_controls),
-       .dapm_widgets = cs47l24_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs47l24_dapm_widgets),
-       .dapm_routes = cs47l24_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(cs47l24_dapm_routes),
+       .component_driver = {
+               .controls               = cs47l24_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs47l24_snd_controls),
+               .dapm_widgets           = cs47l24_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs47l24_dapm_widgets),
+               .dapm_routes            = cs47l24_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(cs47l24_dapm_routes),
+       },
 };
 
 static struct snd_compr_ops cs47l24_compr_ops = {