ASoC: codec duplicated callback function goes to component on adau1761

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/adau1761.c b/sound/soc/codecs/adau1761.c
index b95d29dbd13dcfe6fb00722bfc980122e7b74286..3bc3cc559dde0a1430ff671332bae4ca840bf9a9 100644 (file)
--- a/sound/soc/codecs/adau1761.c
+++ b/sound/soc/codecs/adau1761.c
@@ -719,12 +719,14 @@ static const struct snd_soc_codec_driver adau1761_codec_driver = {
        .set_bias_level = adau1761_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = adau1761_controls,
-       .num_controls = ARRAY_SIZE(adau1761_controls),
-       .dapm_widgets = adau1x61_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(adau1x61_dapm_widgets),
-       .dapm_routes = adau1x61_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(adau1x61_dapm_routes),
+       .component_driver = {
+               .controls               = adau1761_controls,
+               .num_controls           = ARRAY_SIZE(adau1761_controls),
+               .dapm_widgets           = adau1x61_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(adau1x61_dapm_widgets),
+               .dapm_routes            = adau1x61_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(adau1x61_dapm_routes),
+       },
 };
 
 #define ADAU1761_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \