ASoC: codec duplicated callback function goes to component on wl1273

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/wl1273.c b/sound/soc/codecs/wl1273.c
index 1b79778098d29ffbb377efc24576825cdfe8038c..fcffb6e707d9b8fcdacddb77d445eb5d738837ef 100644 (file)
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -484,12 +484,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wl1273 = {
        .probe = wl1273_probe,
        .remove = wl1273_remove,
 
-       .controls = wl1273_controls,
-       .num_controls = ARRAY_SIZE(wl1273_controls),
-       .dapm_widgets = wl1273_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wl1273_dapm_widgets),
-       .dapm_routes = wl1273_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wl1273_dapm_routes),
+       .component_driver = {
+               .controls               = wl1273_controls,
+               .num_controls           = ARRAY_SIZE(wl1273_controls),
+               .dapm_widgets           = wl1273_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wl1273_dapm_widgets),
+               .dapm_routes            = wl1273_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wl1273_dapm_routes),
+       },
 };
 
 static int wl1273_platform_probe(struct platform_device *pdev)