ASoC: codec duplicated callback function goes to component on wm8990

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/wm8990.c b/sound/soc/codecs/wm8990.c
index 23ecd30d8bcad392204528466332eb1d4c0bf7a3..a412fd0a2e643d4b2becde8ce1cbf659ca31e707 100644 (file)
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1299,12 +1299,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8990 = {
        .set_bias_level = wm8990_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls =     wm8990_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8990_snd_controls),
-       .dapm_widgets = wm8990_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8990_dapm_widgets),
-       .dapm_routes =  wm8990_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8990_dapm_routes),
+       .component_driver = {
+               .controls               = wm8990_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8990_snd_controls),
+               .dapm_widgets           = wm8990_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8990_dapm_widgets),
+               .dapm_routes            = wm8990_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8990_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm8990_regmap = {