ASoC: codec duplicated callback function goes to component on ak4641

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/ak4641.c b/sound/soc/codecs/ak4641.c
index b14176f8d884a9f05f72e667b6ac8b52ee4c90e2..c91717d08513594d54faef506ec30fe12967fc73 100644 (file)
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -505,12 +505,14 @@ static struct snd_soc_dai_driver ak4641_dai[] = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_ak4641 = {
-       .controls               = ak4641_snd_controls,
-       .num_controls           = ARRAY_SIZE(ak4641_snd_controls),
-       .dapm_widgets           = ak4641_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(ak4641_dapm_widgets),
-       .dapm_routes            = ak4641_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(ak4641_audio_map),
+       .component_driver = {
+               .controls               = ak4641_snd_controls,
+               .num_controls           = ARRAY_SIZE(ak4641_snd_controls),
+               .dapm_widgets           = ak4641_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ak4641_dapm_widgets),
+               .dapm_routes            = ak4641_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(ak4641_audio_map),
+       },
        .set_bias_level         = ak4641_set_bias_level,
        .suspend_bias_off       = true,
 };