ASoC: codec duplicated callback function goes to component on wm8580

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/wm8580.c b/sound/soc/codecs/wm8580.c
index 66602bf02f6e43f755306bcd6cc04f2b1514c456..2e69270a90156ffbf1e4734dcec84eb715aa494f 100644 (file)
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -904,12 +904,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
        .remove =       wm8580_remove,
        .set_bias_level = wm8580_set_bias_level,
 
-       .controls = wm8580_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8580_snd_controls),
-       .dapm_widgets = wm8580_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8580_dapm_widgets),
-       .dapm_routes = wm8580_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8580_dapm_routes),
+       .component_driver = {
+               .controls               = wm8580_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8580_snd_controls),
+               .dapm_widgets           = wm8580_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8580_dapm_widgets),
+               .dapm_routes            = wm8580_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8580_dapm_routes),
+       },
 };
 
 static const struct of_device_id wm8580_of_match[] = {