ASoC: codec duplicated callback function goes to component on twl6040

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/twl6040.c b/sound/soc/codecs/twl6040.c
index 1f7081043566fe8f6d7557e730009e9b7de6f84a..748036e851ea4d129266ca1e4d97b38e387c4eed 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1156,12 +1156,14 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = {
        .suspend_bias_off = true,
        .ignore_pmdown_time = true,
 
-       .controls = twl6040_snd_controls,
-       .num_controls = ARRAY_SIZE(twl6040_snd_controls),
-       .dapm_widgets = twl6040_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(twl6040_dapm_widgets),
-       .dapm_routes = intercon,
-       .num_dapm_routes = ARRAY_SIZE(intercon),
+       .component_driver = {
+               .controls               = twl6040_snd_controls,
+               .num_controls           = ARRAY_SIZE(twl6040_snd_controls),
+               .dapm_widgets           = twl6040_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(twl6040_dapm_widgets),
+               .dapm_routes            = intercon,
+               .num_dapm_routes        = ARRAY_SIZE(intercon),
+       },
 };
 
 static int twl6040_codec_probe(struct platform_device *pdev)