ASoC: codec duplicated callback function goes to component on ak4554

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/ak4554.c b/sound/soc/codecs/ak4554.c
index 298dedc051403b9dd8ae309a134e6fb9447893c2..b92c548b9d299048964c63a1daf27351d773f624 100644 (file)
--- a/sound/soc/codecs/ak4554.c
+++ b/sound/soc/codecs/ak4554.c
@@ -65,10 +65,12 @@ static struct snd_soc_dai_driver ak4554_dai = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_ak4554 = {
-       .dapm_widgets = ak4554_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ak4554_dapm_widgets),
-       .dapm_routes = ak4554_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ak4554_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = ak4554_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak4554_dapm_widgets),
+               .dapm_routes            = ak4554_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ak4554_dapm_routes),
+       },
 };
 
 static int ak4554_soc_probe(struct platform_device *pdev)