ASoC: codec duplicated callback function goes to component on cs4265

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/cs4265.c b/sound/soc/codecs/cs4265.c
index 55db19ddc5ff34a7fa1134488d972d7bc2ceeae8..fd966bb851cbcb0c2dcd8b5a3713c26b5e6ec7c8 100644 (file)
--- a/sound/soc/codecs/cs4265.c
+++ b/sound/soc/codecs/cs4265.c
@@ -547,13 +547,14 @@ static struct snd_soc_dai_driver cs4265_dai[] = {
 static const struct snd_soc_codec_driver soc_codec_cs4265 = {
        .set_bias_level = cs4265_set_bias_level,
 
-       .dapm_widgets = cs4265_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cs4265_dapm_widgets),
-       .dapm_routes = cs4265_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(cs4265_audio_map),
-
-       .controls = cs4265_snd_controls,
-       .num_controls = ARRAY_SIZE(cs4265_snd_controls),
+       .component_driver = {
+               .controls               = cs4265_snd_controls,
+               .num_controls           = ARRAY_SIZE(cs4265_snd_controls),
+               .dapm_widgets           = cs4265_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cs4265_dapm_widgets),
+               .dapm_routes            = cs4265_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(cs4265_audio_map),
+       },
 };
 
 static const struct regmap_config cs4265_regmap = {