iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: ti: davinci-mcasp: No need for IS_MODULE/BUILTIN check for pcm driver

Browse Source 
Since the platform drivers are selected by the DAI drivers (including
McASP) there is no longer a need to check whether the modules are built-in
or module.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2019-01-03 14:53:45 +02:00 committed by Mark Brown
parent 51a13e401a
commit 2130f15d6c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/ti/davinci-mcasp.c
View File

@ -2149,26 +2149,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
ret = davinci_mcasp_get_dma_type(mcasp); ret = davinci_mcasp_get_dma_type(mcasp);
switch (ret) { switch (ret) {
case PCM_EDMA: case PCM_EDMA:
#if IS_BUILTIN(CONFIG_SND_SOC_TI_EDMA_PCM) || \
(IS_MODULE(CONFIG_SND_SOC_DAVINCI_MCASP) && \
IS_MODULE(CONFIG_SND_SOC_TI_EDMA_PCM))
ret = edma_pcm_platform_register(&pdev->dev); ret = edma_pcm_platform_register(&pdev->dev);
#else
dev_err(&pdev->dev, "Missing SND_EDMA_SOC\n");
ret = -EINVAL;
goto err;
#endif
break; break;
case PCM_SDMA: case PCM_SDMA:
#if IS_BUILTIN(CONFIG_SND_SOC_TI_SDMA_PCM) || \
(IS_MODULE(CONFIG_SND_SOC_DAVINCI_MCASP) && \
IS_MODULE(CONFIG_SND_SOC_TI_SDMA_PCM))
ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL); ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL);
#else
dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n");
ret = -EINVAL;
goto err;
#endif
break; break;
default: default:
dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret); dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);