ASoC: codec duplicated callback function goes to component on wm8903

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/wm8903.c b/sound/soc/codecs/wm8903.c
index a26ca490cf31f9be6bbe61801b39cfe3218c8058..c19ba7ca3a35f89b5aa35982430104b85043fa11 100644 (file)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1880,12 +1880,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8903 = {
        .seq_notifier = wm8903_seq_notifier,
        .suspend_bias_off = true,
 
-       .controls = wm8903_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8903_snd_controls),
-       .dapm_widgets = wm8903_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8903_dapm_widgets),
-       .dapm_routes = wm8903_intercon,
-       .num_dapm_routes = ARRAY_SIZE(wm8903_intercon),
+       .component_driver = {
+               .controls               = wm8903_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8903_snd_controls),
+               .dapm_widgets           = wm8903_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8903_dapm_widgets),
+               .dapm_routes            = wm8903_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(wm8903_intercon),
+       },
 };
 
 static const struct regmap_config wm8903_regmap = {