ASoC: codec duplicated callback function goes to component on rt5631

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/rt5631.c b/sound/soc/codecs/rt5631.c
index 1be2bab7dee3a1b20bc30508938f5b28f02a5998..0e418089c053ca716619da9ad79aca4090f8415b 100644 (file)
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
@@ -1657,12 +1657,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5631 = {
        .probe = rt5631_probe,
        .set_bias_level = rt5631_set_bias_level,
        .suspend_bias_off = true,
-       .controls = rt5631_snd_controls,
-       .num_controls = ARRAY_SIZE(rt5631_snd_controls),
-       .dapm_widgets = rt5631_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(rt5631_dapm_widgets),
-       .dapm_routes = rt5631_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(rt5631_dapm_routes),
+       .component_driver = {
+               .controls               = rt5631_snd_controls,
+               .num_controls           = ARRAY_SIZE(rt5631_snd_controls),
+               .dapm_widgets           = rt5631_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(rt5631_dapm_widgets),
+               .dapm_routes            = rt5631_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(rt5631_dapm_routes),
+       },
 };
 
 static const struct i2c_device_id rt5631_i2c_id[] = {