ASoC: codec duplicated callback function goes to component on ak4671

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/ak4671.c b/sound/soc/codecs/ak4671.c
index c73a9f6..6088afa 100644 (file)
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -612,12 +612,14 @@ static struct snd_soc_dai_driver ak4671_dai = {
 
 static struct snd_soc_codec_driver soc_codec_dev_ak4671 = {
        .set_bias_level = ak4671_set_bias_level,
-       .controls = ak4671_snd_controls,
-       .num_controls = ARRAY_SIZE(ak4671_snd_controls),
-       .dapm_widgets = ak4671_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ak4671_dapm_widgets),
-       .dapm_routes = ak4671_intercon,
-       .num_dapm_routes = ARRAY_SIZE(ak4671_intercon),
+       .component_driver = {
+               .controls               = ak4671_snd_controls,
+               .num_controls           = ARRAY_SIZE(ak4671_snd_controls),
+               .dapm_widgets           = ak4671_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak4671_dapm_widgets),
+               .dapm_routes            = ak4671_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(ak4671_intercon),
+       },
 };
 
 static const struct regmap_config ak4671_regmap = {