ASoC: codec duplicated callback function goes to component on wm8961

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>

1 files changed, 8 insertions, 6 deletions

diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c
index e30446a04740..4b51761f6816 100644
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
@@ -888,12 +888,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8961 = {
         .set_bias_level = wm8961_set_bias_level,
         .suspend_bias_off = true,
 
-        .controls = wm8961_snd_controls,
-        .num_controls = ARRAY_SIZE(wm8961_snd_controls),
-        .dapm_widgets = wm8961_dapm_widgets,
-        .num_dapm_widgets = ARRAY_SIZE(wm8961_dapm_widgets),
-        .dapm_routes = audio_paths,
-        .num_dapm_routes = ARRAY_SIZE(audio_paths),
+        .component_driver = {
+                .controls               = wm8961_snd_controls,
+                .num_controls           = ARRAY_SIZE(wm8961_snd_controls),
+                .dapm_widgets           = wm8961_dapm_widgets,
+                .num_dapm_widgets       = ARRAY_SIZE(wm8961_dapm_widgets),
+                .dapm_routes            = audio_paths,
+                .num_dapm_routes        = ARRAY_SIZE(audio_paths),
+        },
 };
 
 static const struct regmap_config wm8961_regmap = {