ASoC: codec duplicated callback function goes to component on wm8776

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/wm8776.c b/sound/soc/codecs/wm8776.c
index 5af44f9a8cf2395f78ba70b8e1d2d911452d2618..f17a3a8fffb0b2be97a4a48a7da0325eeb9c3bf9 100644 (file)
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -430,12 +430,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8776 = {
        .set_bias_level = wm8776_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8776_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8776_snd_controls),
-       .dapm_widgets = wm8776_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets),
-       .dapm_routes = routes,
-       .num_dapm_routes = ARRAY_SIZE(routes),
+       .component_driver = {
+               .controls               = wm8776_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8776_snd_controls),
+               .dapm_widgets           = wm8776_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8776_dapm_widgets),
+               .dapm_routes            = routes,
+               .num_dapm_routes        = ARRAY_SIZE(routes),
+       },
 };
 
 static const struct of_device_id wm8776_of_match[] = {