ASoC: codec duplicated callback function goes to component on wm9712

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/wm9712.c b/sound/soc/codecs/wm9712.c
index 488a922..e5aafdd 100644 (file)
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -682,12 +682,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = {
        .reg_cache_step = 2,
        .reg_cache_default = wm9712_reg,
 
-       .controls = wm9712_snd_ac97_controls,
-       .num_controls = ARRAY_SIZE(wm9712_snd_ac97_controls),
-       .dapm_widgets = wm9712_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm9712_dapm_widgets),
-       .dapm_routes = wm9712_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(wm9712_audio_map),
+       .component_driver = {
+               .controls               = wm9712_snd_ac97_controls,
+               .num_controls           = ARRAY_SIZE(wm9712_snd_ac97_controls),
+               .dapm_widgets           = wm9712_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm9712_dapm_widgets),
+               .dapm_routes            = wm9712_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(wm9712_audio_map),
+       },
 };
 
 static int wm9712_probe(struct platform_device *pdev)