Commit 2130f15d authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

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

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 51a13e40
...@@ -2149,26 +2149,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment