ASoC: codec duplicated callback function goes to component on cx20442

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/cx20442.c b/sound/soc/codecs/cx20442.c
index fb3885fe0afb75a872a8d08f7d6fb931555e2446..2c12471e42a68dd7ed865cd581a1f27728da85ee 100644 (file)
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -407,10 +407,12 @@ static struct snd_soc_codec_driver cx20442_codec_dev = {
        .reg_word_size = sizeof(u8),
        .read = cx20442_read_reg_cache,
        .write = cx20442_write,
-       .dapm_widgets = cx20442_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets),
-       .dapm_routes = cx20442_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(cx20442_audio_map),
+       .component_driver = {
+               .dapm_widgets           = cx20442_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(cx20442_dapm_widgets),
+               .dapm_routes            = cx20442_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(cx20442_audio_map),
+       },
 };
 
 static int cx20442_platform_probe(struct platform_device *pdev)