]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ASoC: codec duplicated callback function goes to component on bt-sco
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 8 Aug 2016 09:05:36 +0000 (09:05 +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/bt-sco.c

index 2a8d0ee141d414228bb8cc1d67994416b0a7cd25..8014e697d5407d0b43f3bf03089a349c31e0b03a 100644 (file)
@@ -63,10 +63,12 @@ static struct snd_soc_dai_driver bt_sco_dai[] = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_bt_sco = {
-       .dapm_widgets = bt_sco_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(bt_sco_widgets),
-       .dapm_routes = bt_sco_routes,
-       .num_dapm_routes = ARRAY_SIZE(bt_sco_routes),
+       .component_driver = {
+               .dapm_widgets           = bt_sco_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(bt_sco_widgets),
+               .dapm_routes            = bt_sco_routes,
+               .num_dapm_routes        = ARRAY_SIZE(bt_sco_routes),
+       },
 };
 
 static int bt_sco_probe(struct platform_device *pdev)