ASoC: codec duplicated callback function goes to component on ad1836

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/ad1836.c b/sound/soc/codecs/ad1836.c
index e2ce6c4d7ece402548102e3f12ad61164e3689ae..a478239aadacca6815167c8d1ea8205f34aa035d 100644 (file)
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -327,12 +327,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ad1836 = {
        .suspend = ad1836_suspend,
        .resume = ad1836_resume,
 
-       .controls = ad183x_controls,
-       .num_controls = ARRAY_SIZE(ad183x_controls),
-       .dapm_widgets = ad183x_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ad183x_dapm_widgets),
-       .dapm_routes = ad183x_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ad183x_dapm_routes),
+       .component_driver = {
+               .controls               = ad183x_controls,
+               .num_controls           = ARRAY_SIZE(ad183x_controls),
+               .dapm_widgets           = ad183x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ad183x_dapm_widgets),
+               .dapm_routes            = ad183x_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ad183x_dapm_routes),
+       },
 };
 
 static const struct reg_default ad1836_reg_defaults[] = {