ASoC: codec duplicated callback function goes to component on wm9713

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/wm9713.c b/sound/soc/codecs/wm9713.c
index 9849643ef8099c7f3340a719cf160c8ce633f9c5..255a7c2d1d6570f4f8cd1026b9cdaad6665f02a9 100644 (file)
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -1242,12 +1242,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = {
        .resume =       wm9713_soc_resume,
        .set_bias_level = wm9713_set_bias_level,
 
-       .controls = wm9713_snd_ac97_controls,
-       .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls),
-       .dapm_widgets = wm9713_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm9713_dapm_widgets),
-       .dapm_routes = wm9713_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(wm9713_audio_map),
+       .component_driver = {
+               .controls               = wm9713_snd_ac97_controls,
+               .num_controls           = ARRAY_SIZE(wm9713_snd_ac97_controls),
+               .dapm_widgets           = wm9713_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm9713_dapm_widgets),
+               .dapm_routes            = wm9713_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(wm9713_audio_map),
+       },
 };
 
 static int wm9713_probe(struct platform_device *pdev)