ASoC: codec duplicated callback function goes to component on tlv320aic32x4

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/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index 85d4978..28fdfc5 100644 (file)
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -797,12 +797,14 @@ static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = {
        .set_bias_level = aic32x4_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = aic32x4_snd_controls,
-       .num_controls = ARRAY_SIZE(aic32x4_snd_controls),
-       .dapm_widgets = aic32x4_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(aic32x4_dapm_widgets),
-       .dapm_routes = aic32x4_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(aic32x4_dapm_routes),
+       .component_driver = {
+               .controls               = aic32x4_snd_controls,
+               .num_controls           = ARRAY_SIZE(aic32x4_snd_controls),
+               .dapm_widgets           = aic32x4_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(aic32x4_dapm_widgets),
+               .dapm_routes            = aic32x4_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(aic32x4_dapm_routes),
+       },
 };
 
 static int aic32x4_parse_dt(struct aic32x4_priv *aic32x4,