ASoC: codec duplicated callback function goes to component on wm8900

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/wm8900.c b/sound/soc/codecs/wm8900.c
index 5d8dca88d612b3ecdd04e180fc4473dd3ed1d3c6..724cec4a638d4674141d3f1a58c3e77d6fb6d067 100644 (file)
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1214,12 +1214,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8900 = {
        .resume =       wm8900_resume,
        .set_bias_level = wm8900_set_bias_level,
 
-       .controls = wm8900_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8900_snd_controls),
-       .dapm_widgets = wm8900_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8900_dapm_widgets),
-       .dapm_routes = wm8900_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8900_dapm_routes),
+       .component_driver = {
+               .controls               = wm8900_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8900_snd_controls),
+               .dapm_widgets           = wm8900_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8900_dapm_widgets),
+               .dapm_routes            = wm8900_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8900_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm8900_regmap = {