diff options
| author | Peter Ujfalusi | 2019-01-03 13:53:45 +0100 |
|---|---|---|
| committer | Mark Brown | 2019-01-04 16:16:42 +0100 |
| commit | 2130f15d6cd9898a68dc7244084985353030514f (patch) | |
| tree | 04a0ee985b57d4855eaade65b1acc23c45bd462a /sound/soc/ti | |
| parent | ASoC: Intel: bytcr_rt5640: Add quirks for ASUS MeMO Pad 7 (ME176C) (diff) | |
| download | kernel-qcow2-linux-2130f15d6cd9898a68dc7244084985353030514f.tar.gz kernel-qcow2-linux-2130f15d6cd9898a68dc7244084985353030514f.tar.xz kernel-qcow2-linux-2130f15d6cd9898a68dc7244084985353030514f.zip | |
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: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/ti')
| -rw-r--r-- | sound/soc/ti/davinci-mcasp.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index eeda6d5565bc..ee9ab58d4d0c 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2149,26 +2149,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ret = davinci_mcasp_get_dma_type(mcasp); switch (ret) { 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); -#else - dev_err(&pdev->dev, "Missing SND_EDMA_SOC\n"); - ret = -EINVAL; - goto err; -#endif break; 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); -#else - dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n"); - ret = -EINVAL; - goto err; -#endif break; default: dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret); |