ASoC: codec duplicated callback function goes to component on wm8940

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/wm8940.c b/sound/soc/codecs/wm8940.c
index 1c600819f7689b451ae4da81922649961de47c08..3c9febcc863639f6a5cb1f899296dba3bdf05055 100644 (file)
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -728,12 +728,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8940 = {
        .set_bias_level = wm8940_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls =     wm8940_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8940_snd_controls),
-       .dapm_widgets = wm8940_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8940_dapm_widgets),
-       .dapm_routes =  wm8940_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8940_dapm_routes),
+       .component_driver = {
+               .controls               = wm8940_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8940_snd_controls),
+               .dapm_widgets           = wm8940_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8940_dapm_widgets),
+               .dapm_routes            = wm8940_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8940_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm8940_regmap = {