summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/bt-sco.c
diff options
context:
space:
mode:
authorKuninori Morimoto2016-08-08 11:05:36 +0200
committerMark Brown2016-08-08 12:57:57 +0200
commit24fe48d78be574dcd43bc5156f47d37757cfffbd (patch)
tree800b2fcf298bc3008bc90b46ec2055e659dbeab8 /sound/soc/codecs/bt-sco.c
parentASoC: codec duplicated callback function goes to component on cs35l32 (diff)
downloadkernel-qcow2-linux-24fe48d78be574dcd43bc5156f47d37757cfffbd.tar.gz
kernel-qcow2-linux-24fe48d78be574dcd43bc5156f47d37757cfffbd.tar.xz
kernel-qcow2-linux-24fe48d78be574dcd43bc5156f47d37757cfffbd.zip
ASoC: codec duplicated callback function goes to component on bt-sco
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>
Diffstat (limited to 'sound/soc/codecs/bt-sco.c')
-rw-r--r--sound/soc/codecs/bt-sco.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/bt-sco.c b/sound/soc/codecs/bt-sco.c
index 2a8d0ee141d4..8014e697d540 100644
--- a/sound/soc/codecs/bt-sco.c
+++ b/sound/soc/codecs/bt-sco.c
@@ -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)