ASoC: samsung: s3c24xx-i2s: Don't use platform_data for DMA parameters

Since the s3c24xx-dma is converted to use DMA map we can rely on the
DMA subsystem to match DMA channels and slave devices, rather than
passing DMA details from platform_data.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index d59a47d..29196a9 100644 (file)
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -30,8 +30,6 @@
 #include "dma.h"
 #include "s3c24xx-i2s.h"
 
-#include <linux/platform_data/asoc-s3c.h>
-
 static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_out = {
        .addr_width     = 2,
 };
@@ -449,14 +447,8 @@ static const struct snd_soc_component_driver s3c24xx_i2s_component = {
 
 static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
 {
-       int ret = 0;
        struct resource *res;
-       struct s3c_audio_pdata *pdata = dev_get_platdata(&pdev->dev);
-
-       if (!pdata) {
-               dev_err(&pdev->dev, "missing platform data");
-               return -ENXIO;
-       }
+       int ret = 0;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
@@ -468,9 +460,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
                return PTR_ERR(s3c24xx_i2s.regs);
 
        s3c24xx_i2s_pcm_stereo_out.addr = res->start + S3C2410_IISFIFO;
-       s3c24xx_i2s_pcm_stereo_out.filter_data = pdata->dma_playback;
        s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO;
-       s3c24xx_i2s_pcm_stereo_in.filter_data = pdata->dma_capture;
 
        ret = devm_snd_soc_register_component(&pdev->dev,
                        &s3c24xx_i2s_component, &s3c24xx_i2s_dai, 1);
@@ -479,8 +469,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = samsung_asoc_dma_platform_register(&pdev->dev,
-                                                pdata->dma_filter,
+       ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL,
                                                 NULL, NULL);
        if (ret)
                pr_err("failed to register the dma: %d\n", ret);