ASoC: codec duplicated callback function goes to component on wm1250-ev1

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/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c
index ec45c5b..caf5012 100644 (file)
--- a/sound/soc/codecs/wm1250-ev1.c
+++ b/sound/soc/codecs/wm1250-ev1.c
@@ -142,11 +142,12 @@ static struct snd_soc_dai_driver wm1250_ev1_dai = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_wm1250_ev1 = {
-       .dapm_widgets = wm1250_ev1_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm1250_ev1_dapm_widgets),
-       .dapm_routes = wm1250_ev1_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm1250_ev1_dapm_routes),
-
+       .component_driver = {
+               .dapm_widgets           = wm1250_ev1_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm1250_ev1_dapm_widgets),
+               .dapm_routes            = wm1250_ev1_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm1250_ev1_dapm_routes),
+       },
        .set_bias_level = wm1250_ev1_set_bias_level,
        .idle_bias_off = true,
 };