ASoC: codec duplicated callback function goes to component on ab8500-codec

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/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 2fc89155f14a1a2de2eddc2ca60c2f5f5c1190fb..3056487ed5a9be834dcb5c3ee69774dca8208fdc 100644 (file)
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2525,12 +2525,14 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver ab8500_codec_driver = {
        .probe =                ab8500_codec_probe,
-       .controls =             ab8500_ctrls,
-       .num_controls =         ARRAY_SIZE(ab8500_ctrls),
-       .dapm_widgets =         ab8500_dapm_widgets,
-       .num_dapm_widgets =     ARRAY_SIZE(ab8500_dapm_widgets),
-       .dapm_routes =          ab8500_dapm_routes,
-       .num_dapm_routes =      ARRAY_SIZE(ab8500_dapm_routes),
+       .component_driver = {
+               .controls =             ab8500_ctrls,
+               .num_controls =         ARRAY_SIZE(ab8500_ctrls),
+               .dapm_widgets =         ab8500_dapm_widgets,
+               .num_dapm_widgets =     ARRAY_SIZE(ab8500_dapm_widgets),
+               .dapm_routes =          ab8500_dapm_routes,
+               .num_dapm_routes =      ARRAY_SIZE(ab8500_dapm_routes),
+       },
 };
 
 static int ab8500_codec_driver_probe(struct platform_device *pdev)