ASoC: codec duplicated callback function goes to component on wm8997

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/wm8997.c b/sound/soc/codecs/wm8997.c
index 6b0785b..cf23a6b 100644 (file)
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1105,12 +1105,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8997 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = wm8997_set_fll,
 
-       .controls = wm8997_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8997_snd_controls),
-       .dapm_widgets = wm8997_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8997_dapm_widgets),
-       .dapm_routes = wm8997_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8997_dapm_routes),
+       .component_driver = {
+               .controls               = wm8997_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8997_snd_controls),
+               .dapm_widgets           = wm8997_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8997_dapm_widgets),
+               .dapm_routes            = wm8997_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8997_dapm_routes),
+       },
 };
 
 static int wm8997_probe(struct platform_device *pdev)