ASoC: codec duplicated callback function goes to component on adau1781

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/adau1781.c b/sound/soc/codecs/adau1781.c
index bc1bb56..546071c 100644 (file)
--- a/sound/soc/codecs/adau1781.c
+++ b/sound/soc/codecs/adau1781.c
@@ -432,12 +432,14 @@ static const struct snd_soc_codec_driver adau1781_codec_driver = {
        .set_bias_level = adau1781_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = adau1781_controls,
-       .num_controls = ARRAY_SIZE(adau1781_controls),
-       .dapm_widgets = adau1781_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(adau1781_dapm_widgets),
-       .dapm_routes = adau1781_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(adau1781_dapm_routes),
+       .component_driver = {
+               .controls               = adau1781_controls,
+               .num_controls           = ARRAY_SIZE(adau1781_controls),
+               .dapm_widgets           = adau1781_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(adau1781_dapm_widgets),
+               .dapm_routes            = adau1781_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(adau1781_dapm_routes),
+       },
 };
 
 #define ADAU1781_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \