ASoC: codec duplicated callback function goes to component on wm8750

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/wm8750.c b/sound/soc/codecs/wm8750.c
index bd9dcd2161bc9cb394d9aa40833b6221a44420a1..a96a1456897b3ba14b06047c6198a38d45fe77ee 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -713,12 +713,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8750 = {
        .set_bias_level = wm8750_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8750_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8750_snd_controls),
-       .dapm_widgets = wm8750_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
-       .dapm_routes = wm8750_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8750_dapm_routes),
+       .component_driver = {
+               .controls               = wm8750_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8750_snd_controls),
+               .dapm_widgets           = wm8750_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8750_dapm_widgets),
+               .dapm_routes            = wm8750_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8750_dapm_routes),
+       },
 };
 
 static const struct of_device_id wm8750_of_match[] = {