ASoC: codec duplicated callback function goes to component on sta350

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/sta350.c b/sound/soc/codecs/sta350.c
index 33a4612f0a078747e620aeb991cb38404083fe58..9644c20f44e32dca38209693a088ed0585aa011c 100644 (file)
--- a/sound/soc/codecs/sta350.c
+++ b/sound/soc/codecs/sta350.c
@@ -1057,12 +1057,14 @@ static const struct snd_soc_codec_driver sta350_codec = {
        .remove =               sta350_remove,
        .set_bias_level =       sta350_set_bias_level,
        .suspend_bias_off =     true,
-       .controls =             sta350_snd_controls,
-       .num_controls =         ARRAY_SIZE(sta350_snd_controls),
-       .dapm_widgets =         sta350_dapm_widgets,
-       .num_dapm_widgets =     ARRAY_SIZE(sta350_dapm_widgets),
-       .dapm_routes =          sta350_dapm_routes,
-       .num_dapm_routes =      ARRAY_SIZE(sta350_dapm_routes),
+       .component_driver = {
+               .controls =             sta350_snd_controls,
+               .num_controls =         ARRAY_SIZE(sta350_snd_controls),
+               .dapm_widgets =         sta350_dapm_widgets,
+               .num_dapm_widgets =     ARRAY_SIZE(sta350_dapm_widgets),
+               .dapm_routes =          sta350_dapm_routes,
+               .num_dapm_routes =      ARRAY_SIZE(sta350_dapm_routes),
+       },
 };
 
 static const struct regmap_config sta350_regmap = {