Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[karo-tx-linux.git] / sound / soc / omap / omap-mcpdm.c

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index eb05c7ed6d053519a13ec989efd81c890aa10c72..a49dc52f8abc03fac075a56c879aa2bdcaaa5568 100644 (file)
--- 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)