ASoC: codec duplicated callback function goes to component on cs35l32

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/cs35l32.c b/sound/soc/codecs/cs35l32.c
index 287d13740be4e08bbbf7ce29526a97c4eed7b814..7e9806206648c0eafc9a11ca468027ff3b67a0c0 100644 (file)
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
@@ -231,13 +231,14 @@ static int cs35l32_codec_set_sysclk(struct snd_soc_codec *codec,
 static const struct snd_soc_codec_driver soc_codec_dev_cs35l32 = {
        .set_sysclk = cs35l32_codec_set_sysclk,
 
-       .dapm_widgets = cs35l32_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs35l32_dapm_widgets),
-       .dapm_routes = cs35l32_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(cs35l32_audio_map),
-
-       .controls = cs35l32_snd_controls,
-       .num_controls = ARRAY_SIZE(cs35l32_snd_controls),
+       .component_driver = {
+               .controls               = cs35l32_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs35l32_snd_controls),
+               .dapm_widgets           = cs35l32_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs35l32_dapm_widgets),
+               .dapm_routes            = cs35l32_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(cs35l32_audio_map),
+       },
 };
 
 /* Current and threshold powerup sequence Pg37 in datasheet */