ASoC: codec duplicated callback function goes to component on cs42xx8

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/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index 1179101b2b055a639e711049dc389d34e999a011..b4d87379d2bcba6ae490bce1198edda6f57f5f20 100644 (file)
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
@@ -411,12 +411,14 @@ static const struct snd_soc_codec_driver cs42xx8_driver = {
        .probe = cs42xx8_codec_probe,
        .idle_bias_off = true,
 
-       .controls = cs42xx8_snd_controls,
-       .num_controls = ARRAY_SIZE(cs42xx8_snd_controls),
-       .dapm_widgets = cs42xx8_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs42xx8_dapm_widgets),
-       .dapm_routes = cs42xx8_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(cs42xx8_dapm_routes),
+       .component_driver = {
+               .controls               = cs42xx8_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs42xx8_snd_controls),
+               .dapm_widgets           = cs42xx8_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs42xx8_dapm_widgets),
+               .dapm_routes            = cs42xx8_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(cs42xx8_dapm_routes),
+       },
 };
 
 const struct cs42xx8_driver_data cs42448_data = {