ASoC: codec duplicated callback function goes to component on wm8523

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/wm8523.c b/sound/soc/codecs/wm8523.c
index aa287a3965e71f77bc8772969543f4344f93facb..0bb189a3d322c3aac4c4f385b8525c43ad5cfe47 100644 (file)
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -418,12 +418,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8523 = {
        .set_bias_level = wm8523_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8523_controls,
-       .num_controls = ARRAY_SIZE(wm8523_controls),
-       .dapm_widgets = wm8523_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8523_dapm_widgets),
-       .dapm_routes = wm8523_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8523_dapm_routes),
+       .component_driver = {
+               .controls               = wm8523_controls,
+               .num_controls           = ARRAY_SIZE(wm8523_controls),
+               .dapm_widgets           = wm8523_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8523_dapm_widgets),
+               .dapm_routes            = wm8523_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8523_dapm_routes),
+       },
 };
 
 static const struct of_device_id wm8523_of_match[] = {