ASoC: codec duplicated callback function goes to component on wm8728

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/wm8728.c b/sound/soc/codecs/wm8728.c
index 1564e6926527f05ed892332f8ad38aea14382cef..dcd64b38bd7d9230151e6e20c82f67e628f651b1 100644 (file)
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -215,12 +215,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8728 = {
        .set_bias_level = wm8728_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8728_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8728_snd_controls),
-       .dapm_widgets = wm8728_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets),
-       .dapm_routes = wm8728_intercon,
-       .num_dapm_routes = ARRAY_SIZE(wm8728_intercon),
+       .component_driver = {
+               .controls               = wm8728_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8728_snd_controls),
+               .dapm_widgets           = wm8728_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8728_dapm_widgets),
+               .dapm_routes            = wm8728_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(wm8728_intercon),
+       },
 };
 
 static const struct of_device_id wm8728_of_match[] = {