ASoC: codec duplicated callback function goes to component on wm5102

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/wm5102.c b/sound/soc/codecs/wm5102.c
index 846deed6af417c7fcca17f35960679acb1ac4013..1295978e836037da368b4a4837f91786c0f5b234 100644 (file)
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -2000,12 +2000,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5102 = {
        .set_sysclk = arizona_set_sysclk,
        .set_pll = wm5102_set_fll,
 
-       .controls = wm5102_snd_controls,
-       .num_controls = ARRAY_SIZE(wm5102_snd_controls),
-       .dapm_widgets = wm5102_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm5102_dapm_widgets),
-       .dapm_routes = wm5102_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm5102_dapm_routes),
+       .component_driver = {
+               .controls               = wm5102_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm5102_snd_controls),
+               .dapm_widgets           = wm5102_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm5102_dapm_widgets),
+               .dapm_routes            = wm5102_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm5102_dapm_routes),
+       },
 };
 
 static struct snd_compr_ops wm5102_compr_ops = {