ASoC: codec duplicated callback function goes to component on ml26124

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/ml26124.c b/sound/soc/codecs/ml26124.c
index f561c78b9e0e0ca8df6e4647786009b596bc2b9b..69e5e18880c53c35835b0bb8e5b5eb749c0c16b7 100644 (file)
--- a/sound/soc/codecs/ml26124.c
+++ b/sound/soc/codecs/ml26124.c
@@ -541,12 +541,14 @@ static struct snd_soc_codec_driver soc_codec_dev_ml26124 = {
        .probe =        ml26124_probe,
        .set_bias_level = ml26124_set_bias_level,
        .suspend_bias_off = true,
-       .dapm_widgets = ml26124_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ml26124_dapm_widgets),
-       .dapm_routes = ml26124_intercon,
-       .num_dapm_routes = ARRAY_SIZE(ml26124_intercon),
-       .controls = ml26124_snd_controls,
-       .num_controls = ARRAY_SIZE(ml26124_snd_controls),
+       .component_driver = {
+               .controls               = ml26124_snd_controls,
+               .num_controls           = ARRAY_SIZE(ml26124_snd_controls),
+               .dapm_widgets           = ml26124_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ml26124_dapm_widgets),
+               .dapm_routes            = ml26124_intercon,
+               .num_dapm_routes        = ARRAY_SIZE(ml26124_intercon),
+       },
 };
 
 static const struct regmap_config ml26124_i2c_regmap = {