ASoC: codec duplicated callback function goes to component on da732x

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/da732x.c b/sound/soc/codecs/da732x.c
index 461506a4ca6a2ddb790b1646f27bce2d7abf25ba..c1cc1c1c28f26d75a24ca0ee792c615996a06d66 100644 (file)
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -1501,12 +1501,14 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
 
 static struct snd_soc_codec_driver soc_codec_dev_da732x = {
        .set_bias_level         = da732x_set_bias_level,
-       .controls               = da732x_snd_controls,
-       .num_controls           = ARRAY_SIZE(da732x_snd_controls),
-       .dapm_widgets           = da732x_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(da732x_dapm_widgets),
-       .dapm_routes            = da732x_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(da732x_dapm_routes),
+       .component_driver = {
+               .controls               = da732x_snd_controls,
+               .num_controls           = ARRAY_SIZE(da732x_snd_controls),
+               .dapm_widgets           = da732x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(da732x_dapm_widgets),
+               .dapm_routes            = da732x_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(da732x_dapm_routes),
+       },
        .set_pll                = da732x_set_dai_pll,
 };