ASoC: codec duplicated callback function goes to component on alc5632

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/alc5632.c b/sound/soc/codecs/alc5632.c
index 4d3ba33eb6f928dc32146645b195d528592711c5..adb80d8719bdd813ec850583ee10ce68880a153b 100644 (file)
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
@@ -1072,12 +1072,14 @@ static const struct snd_soc_codec_driver soc_codec_device_alc5632 = {
        .set_bias_level = alc5632_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = alc5632_snd_controls,
-       .num_controls = ARRAY_SIZE(alc5632_snd_controls),
-       .dapm_widgets = alc5632_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(alc5632_dapm_widgets),
-       .dapm_routes = alc5632_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(alc5632_dapm_routes),
+       .component_driver = {
+               .controls               = alc5632_snd_controls,
+               .num_controls           = ARRAY_SIZE(alc5632_snd_controls),
+               .dapm_widgets           = alc5632_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(alc5632_dapm_widgets),
+               .dapm_routes            = alc5632_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(alc5632_dapm_routes),
+       },
 };
 
 static const struct regmap_config alc5632_regmap = {