Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / samsung / dmaengine.c

diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c
index 2c87f380bfc434b12591412a149e3f43e12c993d..9104c98deeb75ab8ac3113e5be85ff4958fa2bdf 100644 (file)
--- a/sound/soc/samsung/dmaengine.c
+++ b/sound/soc/samsung/dmaengine.c
@@ -16,49 +16,18 @@
  */
 
 #include <linux/module.h>
-#include <linux/amba/pl08x.h>
-#include <linux/platform_data/dma-s3c24xx.h>
-
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/dmaengine_pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dai.h>
 
 #include "dma.h"
 
-void samsung_asoc_init_dma_data(struct snd_soc_dai *dai,
-                               struct s3c_dma_params *playback,
-                               struct s3c_dma_params *capture)
-{
-       struct snd_dmaengine_dai_dma_data *playback_data = NULL;
-       struct snd_dmaengine_dai_dma_data *capture_data = NULL;
-
-       if (playback) {
-               playback_data = &playback->dma_data;
-               playback_data->filter_data = playback->slave;
-               playback_data->chan_name = playback->ch_name;
-               playback_data->addr = playback->dma_addr;
-               playback_data->addr_width = playback->dma_size;
-       }
-       if (capture) {
-               capture_data = &capture->dma_data;
-               capture_data->filter_data = capture->slave;
-               capture_data->chan_name = capture->ch_name;
-               capture_data->addr = capture->dma_addr;
-               capture_data->addr_width = capture->dma_size;
-       }
-
-       snd_soc_dai_init_dma_data(dai, playback_data, capture_data);
-}
-EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data);
-
 int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,
                                       const char *tx, const char *rx)
 {
        unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT;
-
        struct snd_dmaengine_pcm_config *pcm_conf;
 
        pcm_conf = devm_kzalloc(dev, sizeof(*pcm_conf), GFP_KERNEL);