ASoC: codec duplicated callback function goes to component on inno_rk3036

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/inno_rk3036.c b/sound/soc/codecs/inno_rk3036.c
index 9b6e8840a1b56d5741ade1ee35c3a32034edfe9a..b918ba5c8ce5ce73acc35e843241b409113ea292 100644 (file)
--- a/sound/soc/codecs/inno_rk3036.c
+++ b/sound/soc/codecs/inno_rk3036.c
@@ -380,12 +380,14 @@ static struct snd_soc_codec_driver rk3036_codec_driver = {
        .probe                  = rk3036_codec_probe,
        .remove                 = rk3036_codec_remove,
        .set_bias_level         = rk3036_codec_set_bias_level,
-       .controls               = rk3036_codec_dapm_controls,
-       .num_controls           = ARRAY_SIZE(rk3036_codec_dapm_controls),
-       .dapm_routes            = rk3036_codec_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(rk3036_codec_dapm_routes),
-       .dapm_widgets           = rk3036_codec_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(rk3036_codec_dapm_widgets),
+       .component_driver = {
+               .controls               = rk3036_codec_dapm_controls,
+               .num_controls           = ARRAY_SIZE(rk3036_codec_dapm_controls),
+               .dapm_routes            = rk3036_codec_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rk3036_codec_dapm_routes),
+               .dapm_widgets           = rk3036_codec_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rk3036_codec_dapm_widgets),
+       },
 };
 
 static const struct regmap_config rk3036_codec_regmap_config = {