ASoC: codec duplicated callback function goes to component on tlv320aic31xx

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/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c
index 3c5e1df..e46fb47 100644 (file)
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@ -1114,12 +1114,14 @@ static struct snd_soc_codec_driver soc_codec_driver_aic31xx = {
        .set_bias_level         = aic31xx_set_bias_level,
        .suspend_bias_off       = true,
 
-       .controls               = aic31xx_snd_controls,
-       .num_controls           = ARRAY_SIZE(aic31xx_snd_controls),
-       .dapm_widgets           = aic31xx_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(aic31xx_dapm_widgets),
-       .dapm_routes            = aic31xx_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(aic31xx_audio_map),
+       .component_driver = {
+               .controls               = aic31xx_snd_controls,
+               .num_controls           = ARRAY_SIZE(aic31xx_snd_controls),
+               .dapm_widgets           = aic31xx_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(aic31xx_dapm_widgets),
+               .dapm_routes            = aic31xx_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(aic31xx_audio_map),
+       },
 };
 
 static const struct snd_soc_dai_ops aic31xx_dai_ops = {