ASoC: codec duplicated callback function goes to component on sgtl5000

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/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index 527b759..a635bd0 100644 (file)
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -1151,12 +1151,14 @@ static struct snd_soc_codec_driver sgtl5000_driver = {
        .remove = sgtl5000_remove,
        .set_bias_level = sgtl5000_set_bias_level,
        .suspend_bias_off = true,
-       .controls = sgtl5000_snd_controls,
-       .num_controls = ARRAY_SIZE(sgtl5000_snd_controls),
-       .dapm_widgets = sgtl5000_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(sgtl5000_dapm_widgets),
-       .dapm_routes = sgtl5000_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(sgtl5000_dapm_routes),
+       .component_driver = {
+               .controls               = sgtl5000_snd_controls,
+               .num_controls           = ARRAY_SIZE(sgtl5000_snd_controls),
+               .dapm_widgets           = sgtl5000_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(sgtl5000_dapm_widgets),
+               .dapm_routes            = sgtl5000_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(sgtl5000_dapm_routes),
+       },
 };
 
 static const struct regmap_config sgtl5000_regmap = {