ASoC: codec duplicated callback function goes to component on ak4642

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/ak4642.c b/sound/soc/codecs/ak4642.c
index cc941d66ec3d2f4d1d75104f46c1329ebb9abb8a..2609f95b7d197946c5449610c28287920f6b6c10 100644 (file)
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -555,12 +555,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4642 = {
        .suspend                = ak4642_suspend,
        .resume                 = ak4642_resume,
        .set_bias_level         = ak4642_set_bias_level,
-       .controls               = ak4642_snd_controls,
-       .num_controls           = ARRAY_SIZE(ak4642_snd_controls),
-       .dapm_widgets           = ak4642_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(ak4642_dapm_widgets),
-       .dapm_routes            = ak4642_intercon,
-       .num_dapm_routes        = ARRAY_SIZE(ak4642_intercon),
+       .component_driver = {
+               .controls               = ak4642_snd_controls,
+               .num_controls           = ARRAY_SIZE(ak4642_snd_controls),
+               .dapm_widgets           = ak4642_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak4642_dapm_widgets),
+               .dapm_routes            = ak4642_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(ak4642_intercon),
+       },
 };
 
 static const struct regmap_config ak4642_regmap = {