ASoC: codec duplicated callback function goes to component on wm9867

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/max9867.c b/sound/soc/codecs/max9867.c
index 2a22fddeb6afa02dbfb26b452cd4fd0f91b4024d..c9673235078d5df788947d60d88330bcad0c37eb 100644 (file)
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -417,12 +417,14 @@ static int max9867_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver max9867_codec = {
        .probe = max9867_probe,
-       .controls = max9867_snd_controls,
-       .num_controls = ARRAY_SIZE(max9867_snd_controls),
-       .dapm_routes = max9867_audio_map,
-       .num_dapm_routes = ARRAY_SIZE(max9867_audio_map),
-       .dapm_widgets = max9867_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(max9867_dapm_widgets),
+       .component_driver = {
+               .controls               = max9867_snd_controls,
+               .num_controls           = ARRAY_SIZE(max9867_snd_controls),
+               .dapm_routes            = max9867_audio_map,
+               .num_dapm_routes        = ARRAY_SIZE(max9867_audio_map),
+               .dapm_widgets           = max9867_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max9867_dapm_widgets),
+       },
 };
 
 static bool max9867_volatile_register(struct device *dev, unsigned int reg)