ASoC: codec duplicated callback function goes to component on wm8998

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/wm8998.c b/sound/soc/codecs/wm8998.c
index 3a5c896a2d138f3fd9c7294786e5663373c10231..315b23b836d0f7b24af955b960c49bce14ef7960 100644 (file)
--- a/sound/soc/codecs/wm8998.c
+++ b/sound/soc/codecs/wm8998.c
@@ -1361,12 +1361,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = wm8998_set_fll,
 
-       .controls = wm8998_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8998_snd_controls),
-       .dapm_widgets = wm8998_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8998_dapm_widgets),
-       .dapm_routes = wm8998_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8998_dapm_routes),
+       .component_driver = {
+               .controls               = wm8998_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8998_snd_controls),
+               .dapm_widgets           = wm8998_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8998_dapm_widgets),
+               .dapm_routes            = wm8998_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8998_dapm_routes),
+       },
 };
 
 static int wm8998_probe(struct platform_device *pdev)