ASoC: codec duplicated callback function goes to component on sn95031

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/sn95031.c b/sound/soc/codecs/sn95031.c
index 3a7de0159f2464f14f124de3cc09741e0f49e612..eae54c37cff948fcb38f0665d0a3dfd16e1acba1 100644 (file)
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -888,12 +888,14 @@ static struct snd_soc_codec_driver sn95031_codec = {
        .set_bias_level = sn95031_set_vaud_bias,
        .idle_bias_off  = true,
 
-       .controls       = sn95031_snd_controls,
-       .num_controls   = ARRAY_SIZE(sn95031_snd_controls),
-       .dapm_widgets   = sn95031_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(sn95031_dapm_widgets),
-       .dapm_routes    = sn95031_audio_map,
-       .num_dapm_routes        = ARRAY_SIZE(sn95031_audio_map),
+       .component_driver = {
+               .controls               = sn95031_snd_controls,
+               .num_controls           = ARRAY_SIZE(sn95031_snd_controls),
+               .dapm_widgets           = sn95031_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(sn95031_dapm_widgets),
+               .dapm_routes            = sn95031_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(sn95031_audio_map),
+       },
 };
 
 static int sn95031_device_probe(struct platform_device *pdev)