diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-15 10:13:53 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-15 10:13:53 (GMT) |
| commit | 39c36ad00ba59eafa8115c797ace4f3dc7fdf7b0 (patch) | |
| tree | dffcc4adbf21514f43f1ace39ea8a8e6735903d5 /sound/soc/omap/omap-mcpdm.c | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
| parent | 9ab1fac4829b3da0ba4d3f44d95d3e8ad13e6629 (diff) | |
| download | linux-39c36ad00ba59eafa8115c797ace4f3dc7fdf7b0.tar.xz | |
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
Diffstat (limited to 'sound/soc/omap/omap-mcpdm.c')
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index eb05c7e..a49dc52 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -66,7 +66,6 @@ struct omap_mcpdm { bool restart; struct snd_dmaengine_dai_dma_data dma_data[2]; - unsigned int dma_req[2]; }; /* @@ -477,19 +476,8 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) mcpdm->dma_data[0].addr = res->start + MCPDM_REG_DN_DATA; mcpdm->dma_data[1].addr = res->start + MCPDM_REG_UP_DATA; - res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link"); - if (!res) - return -ENODEV; - - mcpdm->dma_req[0] = res->start; - mcpdm->dma_data[0].filter_data = &mcpdm->dma_req[0]; - - res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "up_link"); - if (!res) - return -ENODEV; - - mcpdm->dma_req[1] = res->start; - mcpdm->dma_data[1].filter_data = &mcpdm->dma_req[1]; + mcpdm->dma_data[0].filter_data = "dn_link"; + mcpdm->dma_data[1].filter_data = "up_link"; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); if (res == NULL) |