ASoC: codec duplicated callback function goes to component on wm8741
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 08:50:19 +0000 (08:50 +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/wm8741.c

index 36ef91f..3e43272 100644 (file)
@@ -502,10 +502,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8741 = {
        .remove =       wm8741_remove,
        .resume =       wm8741_resume,
 
-       .dapm_widgets = wm8741_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8741_dapm_widgets),
-       .dapm_routes = wm8741_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8741_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = wm8741_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8741_dapm_widgets),
+               .dapm_routes            = wm8741_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8741_dapm_routes),
+       },
 };
 
 static const struct of_device_id wm8741_of_match[] = {