ASoC: codec duplicated callback function goes to component on tlv320aic23

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/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index cd8c02b..410cae0 100644 (file)
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -583,12 +583,14 @@ static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = {
        .set_bias_level = tlv320aic23_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = tlv320aic23_snd_controls,
-       .num_controls = ARRAY_SIZE(tlv320aic23_snd_controls),
-       .dapm_widgets = tlv320aic23_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(tlv320aic23_dapm_widgets),
-       .dapm_routes = tlv320aic23_intercon,
-       .num_dapm_routes = ARRAY_SIZE(tlv320aic23_intercon),
+       .component_driver = {
+               .controls               = tlv320aic23_snd_controls,
+               .num_controls           = ARRAY_SIZE(tlv320aic23_snd_controls),
+               .dapm_widgets           = tlv320aic23_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(tlv320aic23_dapm_widgets),
+               .dapm_routes            = tlv320aic23_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(tlv320aic23_intercon),
+       },
 };
 
 int tlv320aic23_probe(struct device *dev, struct regmap *regmap)