ASoC: codec duplicated callback function goes to component on ak5386

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/ak5386.c b/sound/soc/codecs/ak5386.c
index afa95360826d5f5da2703c18899140da63739b03..0ef2df223336700ec1b55c70eb073b0960e2a18d 100644 (file)
--- a/sound/soc/codecs/ak5386.c
+++ b/sound/soc/codecs/ak5386.c
@@ -74,10 +74,12 @@ static struct snd_soc_codec_driver soc_codec_ak5386 = {
        .remove = ak5386_soc_remove,
        .suspend = ak5386_soc_suspend,
        .resume = ak5386_soc_resume,
-       .dapm_widgets = ak5386_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ak5386_dapm_widgets),
-       .dapm_routes = ak5386_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ak5386_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = ak5386_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak5386_dapm_widgets),
+               .dapm_routes            = ak5386_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ak5386_dapm_routes),
+       },
 };
 
 static int ak5386_set_dai_fmt(struct snd_soc_dai *codec_dai,