ASoC: codec duplicated callback function goes to component on wm9850

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/max9850.c b/sound/soc/codecs/max9850.c
index c14a79d..0610840 100644 (file)
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
@@ -306,12 +306,14 @@ static struct snd_soc_codec_driver soc_codec_dev_max9850 = {
        .set_bias_level = max9850_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = max9850_controls,
-       .num_controls = ARRAY_SIZE(max9850_controls),
-       .dapm_widgets = max9850_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(max9850_dapm_widgets),
-       .dapm_routes = max9850_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes),
+       .component_driver = {
+               .controls               = max9850_controls,
+               .num_controls           = ARRAY_SIZE(max9850_controls),
+               .dapm_widgets           = max9850_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max9850_dapm_widgets),
+               .dapm_routes            = max9850_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(max9850_dapm_routes),
+       },
 };
 
 static int max9850_i2c_probe(struct i2c_client *i2c,