ASoC: codec duplicated callback function goes to component on wm8974

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/wm8974.c b/sound/soc/codecs/wm8974.c
index dc8c3b1ebb6fe9a98b3468daa5cc6d9e06f6ae6a..fbda6e3f8a9dfd7d2901d0286364555a64178b9a 100644 (file)
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -681,12 +681,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8974 = {
        .set_bias_level = wm8974_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8974_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8974_snd_controls),
-       .dapm_widgets = wm8974_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8974_dapm_widgets),
-       .dapm_routes = wm8974_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8974_dapm_routes),
+       .component_driver = {
+               .controls               = wm8974_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8974_snd_controls),
+               .dapm_widgets           = wm8974_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8974_dapm_widgets),
+               .dapm_routes            = wm8974_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8974_dapm_routes),
+       },
 };
 
 static int wm8974_i2c_probe(struct i2c_client *i2c,