diff options
| author | Mark Brown <broonie@kernel.org> | 2018-03-28 05:26:03 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-28 05:26:03 +0300 |
| commit | dd4232c55fdf907569c1b4ceee01549174a1a84b (patch) | |
| tree | 4029611029ba10a23d157b62e1a604506cae2dbe /sound/soc/sh/dma-sh7760.c | |
| parent | 219248cc3ffc8729860e3ae3b31698d165f54f1b (diff) | |
| parent | 7ecbd6a91b1e9bb90a4f3be641669347aacc5ab5 (diff) | |
| download | linux-dd4232c55fdf907569c1b4ceee01549174a1a84b.tar.xz | |
Merge remote-tracking branch 'asoc/topic/component-platform' into asoc-next
Diffstat (limited to 'sound/soc/sh/dma-sh7760.c')
| -rw-r--r-- | sound/soc/sh/dma-sh7760.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 1e7d417b53ef..2dc3b762fdd9 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c @@ -320,14 +320,15 @@ static int camelot_pcm_new(struct snd_soc_pcm_runtime *rtd) return 0; } -static const struct snd_soc_platform_driver sh7760_soc_platform = { +static const struct snd_soc_component_driver sh7760_soc_component = { .ops = &camelot_pcm_ops, .pcm_new = camelot_pcm_new, }; static int sh7760_soc_platform_probe(struct platform_device *pdev) { - return devm_snd_soc_register_platform(&pdev->dev, &sh7760_soc_platform); + return devm_snd_soc_register_component(&pdev->dev, &sh7760_soc_component, + NULL, 0); } static struct platform_driver sh7760_pcm_driver = { |