ASoC: codec duplicated callback function goes to component on wm5100

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/wm5100.c b/sound/soc/codecs/wm5100.c
index 512a9d25fe6f34e82aeaeb0065673aa7a43c931f..8cbdf1701222316d3402a4b1176a047d266f83a1 100644 (file)
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2390,12 +2390,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5100 = {
        .idle_bias_off = 1,
 
        .seq_notifier = wm5100_seq_notifier,
-       .controls = wm5100_snd_controls,
-       .num_controls = ARRAY_SIZE(wm5100_snd_controls),
-       .dapm_widgets = wm5100_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm5100_dapm_widgets),
-       .dapm_routes = wm5100_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm5100_dapm_routes),
+       .component_driver = {
+               .controls               = wm5100_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm5100_snd_controls),
+               .dapm_widgets           = wm5100_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm5100_dapm_widgets),
+               .dapm_routes            = wm5100_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm5100_dapm_routes),
+       },
 };
 
 static const struct regmap_config wm5100_regmap = {