ASoC: codec duplicated callback function goes to component on wm8995

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/wm8995.c b/sound/soc/codecs/wm8995.c
index 24500bafb0a89708edf155862b0d7a1e0fb93029..19b08a5cae625f0362fc29e2b4e5198588ed089f 100644 (file)
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -2192,12 +2192,14 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
        .set_bias_level = wm8995_set_bias_level,
        .idle_bias_off = true,
 
-       .controls = wm8995_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8995_snd_controls),
-       .dapm_widgets = wm8995_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8995_dapm_widgets),
-       .dapm_routes = wm8995_intercon,
-       .num_dapm_routes = ARRAY_SIZE(wm8995_intercon),
+       .component_driver = {
+               .controls               = wm8995_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8995_snd_controls),
+               .dapm_widgets           = wm8995_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8995_dapm_widgets),
+               .dapm_routes            = wm8995_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(wm8995_intercon),
+       },
 };
 
 static const struct regmap_config wm8995_regmap = {