ASoC: codec duplicated callback function goes to component on wm8996

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/wm8996.c b/sound/soc/codecs/wm8996.c
index a7304425121855b701f1cf1d98ae70232ad84bc3..abacf6c9949999b434824025aeba964d1581155d 100644 (file)
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2690,12 +2690,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8996 = {
        .set_bias_level = wm8996_set_bias_level,
        .idle_bias_off  = true,
        .seq_notifier = wm8996_seq_notifier,
-       .controls = wm8996_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8996_snd_controls),
-       .dapm_widgets = wm8996_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8996_dapm_widgets),
-       .dapm_routes = wm8996_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8996_dapm_routes),
+       .component_driver = {
+               .controls               = wm8996_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8996_snd_controls),
+               .dapm_widgets           = wm8996_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8996_dapm_widgets),
+               .dapm_routes            = wm8996_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8996_dapm_routes),
+       },
        .set_pll = wm8996_set_fll,
 };