ASoC: codec duplicated callback function goes to component on wm8731

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/wm8731.c b/sound/soc/codecs/wm8731.c
index d18261a..545fc9a 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -632,12 +632,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
        .set_bias_level = wm8731_set_bias_level,
        .suspend_bias_off = true,
 
-       .dapm_widgets = wm8731_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
-       .dapm_routes = wm8731_intercon,
-       .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
-       .controls =     wm8731_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8731_snd_controls),
+       .component_driver = {
+               .controls               = wm8731_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8731_snd_controls),
+               .dapm_widgets           = wm8731_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8731_dapm_widgets),
+               .dapm_routes            = wm8731_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(wm8731_intercon),
+       },
 };
 
 static const struct of_device_id wm8731_of_match[] = {