ASoC: codec duplicated callback function goes to component on wm2200

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/wm2200.c b/sound/soc/codecs/wm2200.c
index fd1439e..d913d0e 100644 (file)
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
@@ -2111,12 +2111,14 @@ static struct snd_soc_codec_driver soc_codec_wm2200 = {
        .set_sysclk = wm2200_set_sysclk,
        .set_pll = wm2200_set_fll,
 
-       .controls = wm2200_snd_controls,
-       .num_controls = ARRAY_SIZE(wm2200_snd_controls),
-       .dapm_widgets = wm2200_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm2200_dapm_widgets),
-       .dapm_routes = wm2200_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm2200_dapm_routes),
+       .component_driver = {
+               .controls               = wm2200_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm2200_snd_controls),
+               .dapm_widgets           = wm2200_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm2200_dapm_widgets),
+               .dapm_routes            = wm2200_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm2200_dapm_routes),
+       },
 };
 
 static irqreturn_t wm2200_irq(int irq, void *data)