ASoC: codec duplicated callback function goes to component on tlv320aic26

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/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 2c904d7150ad7968b0f15928ba68c4e6ddcc16b5..14aa96d417198500bf94a037e58592fad654119f 100644 (file)
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -321,12 +321,14 @@ static int aic26_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver aic26_soc_codec_dev = {
        .probe = aic26_probe,
-       .controls = aic26_snd_controls,
-       .num_controls = ARRAY_SIZE(aic26_snd_controls),
-       .dapm_widgets = tlv320aic26_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(tlv320aic26_dapm_widgets),
-       .dapm_routes = tlv320aic26_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(tlv320aic26_dapm_routes),
+       .component_driver = {
+               .controls               = aic26_snd_controls,
+               .num_controls           = ARRAY_SIZE(aic26_snd_controls),
+               .dapm_widgets           = tlv320aic26_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(tlv320aic26_dapm_widgets),
+               .dapm_routes            = tlv320aic26_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(tlv320aic26_dapm_routes),
+       },
 };
 
 static const struct regmap_config aic26_regmap = {