OSDN Git Service

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

index c5be1bd..90c756d 100644 (file)
@@ -59,10 +59,12 @@ static struct snd_soc_dai_driver ads117x_dai = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_ads117x = {
-       .dapm_widgets = ads117x_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(ads117x_dapm_widgets),
-       .dapm_routes = ads117x_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(ads117x_dapm_routes),
+       .component_driver = {
+               .dapm_widgets           = ads117x_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(ads117x_dapm_widgets),
+               .dapm_routes            = ads117x_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(ads117x_dapm_routes),
+       },
 };
 
 static int ads117x_probe(struct platform_device *pdev)