ASoC: codec duplicated callback function goes to component on cs42l52

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/cs42l52.c b/sound/soc/codecs/cs42l52.c
index 47b97fcefb0ba76818d6c01bcb0e24a8afa02c31..0d9c4a57301bb4a150c34d0f4e29384cd55915f5 100644 (file)
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
@@ -1056,13 +1056,14 @@ static const struct snd_soc_codec_driver soc_codec_dev_cs42l52 = {
        .set_bias_level = cs42l52_set_bias_level,
        .suspend_bias_off = true,
 
-       .dapm_widgets = cs42l52_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs42l52_dapm_widgets),
-       .dapm_routes = cs42l52_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(cs42l52_audio_map),
-
-       .controls = cs42l52_snd_controls,
-       .num_controls = ARRAY_SIZE(cs42l52_snd_controls),
+       .component_driver = {
+               .controls               = cs42l52_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs42l52_snd_controls),
+               .dapm_widgets           = cs42l52_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs42l52_dapm_widgets),
+               .dapm_routes            = cs42l52_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(cs42l52_audio_map),
+       },
 };
 
 /* Current and threshold powerup sequence Pg37 */