diff options
| author | Mark Brown <broonie@kernel.org> | 2018-02-26 11:18:36 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-02-26 11:18:36 +0000 |
| commit | 8596c5c36c0473ca086dc851e5bd90452b3355d9 (patch) | |
| tree | a8b789bf6928ab3767315ce7c08d7ba02d9ed9f9 /sound/soc/stm | |
| parent | 037002b14b7ae217aa79b260228ba51afc516a8c (diff) | |
| parent | 78648092ef46255e6dc6685202164199c86cf930 (diff) | |
| download | linux-8596c5c36c0473ca086dc851e5bd90452b3355d9.tar.bz2 | |
Merge branch 'topic/generic-dmaengine' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-stm32
Diffstat (limited to 'sound/soc/stm')
| -rw-r--r-- | sound/soc/stm/stm32_adfsdm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index 7306e3eca9e1..db73fef3e500 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -281,7 +281,7 @@ static void stm32_adfsdm_pcm_free(struct snd_pcm *pcm) } } -static struct snd_soc_platform_driver stm32_adfsdm_soc_platform = { +static struct snd_soc_component_driver stm32_adfsdm_soc_platform = { .ops = &stm32_adfsdm_pcm_ops, .pcm_new = stm32_adfsdm_pcm_new, .pcm_free = stm32_adfsdm_pcm_free, @@ -322,8 +322,9 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) if (IS_ERR(priv->iio_cb)) return PTR_ERR(priv->iio_cb); - ret = devm_snd_soc_register_platform(&pdev->dev, - &stm32_adfsdm_soc_platform); + ret = devm_snd_soc_register_component(&pdev->dev, + &stm32_adfsdm_soc_platform, + NULL, 0); if (ret < 0) dev_err(&pdev->dev, "%s: Failed to register PCM platform\n", __func__); |