ASoC: codec duplicated callback function goes to component on wm98357a
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:18:31 +0000 (09:18 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Aug 2016 10:57:57 +0000 (11:57 +0100)
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>
sound/soc/codecs/max98357a.c

index 5b1dfb1..6a6b68a 100644 (file)
@@ -74,10 +74,12 @@ static int max98357a_codec_probe(struct snd_soc_codec *codec)
 
 static struct snd_soc_codec_driver max98357a_codec_driver = {
        .probe                  = max98357a_codec_probe,
-       .dapm_widgets           = max98357a_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(max98357a_dapm_widgets),
-       .dapm_routes            = max98357a_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(max98357a_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = max98357a_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(max98357a_dapm_widgets),
+               .dapm_routes            = max98357a_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(max98357a_dapm_routes),
+       },
 };
 
 static const struct snd_soc_dai_ops max98357a_dai_ops = {