summaryrefslogtreecommitdiff
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-02-14 12:03:25 +0000
committerMark Brown <broonie@kernel.org>2018-02-14 12:03:25 +0000
commit191db1ceb88264eea441648a63475538c5050461 (patch)
tree14cd917d53ae65d212523ef21307badfdf0a948f /sound/soc/samsung
parentbeff23ff26db0c1df2eaabc0dfe877bcbf05f6db (diff)
parent03a0ddeda7ebafea8e99078581a50d856e3587a4 (diff)
Merge branch 'topic/component-platform' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/idma.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c
index a635df61f928..b1f09b942410 100644
--- a/sound/soc/samsung/idma.c
+++ b/sound/soc/samsung/idma.c
@@ -399,7 +399,7 @@ void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr)
}
EXPORT_SYMBOL_GPL(idma_reg_addr_init);
-static const struct snd_soc_platform_driver asoc_idma_platform = {
+static const struct snd_soc_component_driver asoc_idma_platform = {
.ops = &idma_ops,
.pcm_new = idma_new,
.pcm_free = idma_free,
@@ -411,7 +411,8 @@ static int asoc_idma_platform_probe(struct platform_device *pdev)
if (idma_irq < 0)
return idma_irq;
- return devm_snd_soc_register_platform(&pdev->dev, &asoc_idma_platform);
+ return devm_snd_soc_register_component(&pdev->dev, &asoc_idma_platform,
+ NULL, 0);
}
static struct platform_driver asoc_idma_driver = {