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

[karo-tx-linux.git] / sound / soc / intel / common / sst-firmware.c

diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c
index ebcca6dc48d189eb16b8903683db5460a3955357..1636a1eeb0021efa076674e3375db682c1cbb45b 100644 (file)
--- a/sound/soc/intel/common/sst-firmware.c
+++ b/sound/soc/intel/common/sst-firmware.c
@@ -26,7 +26,6 @@
 #include <linux/acpi.h>
 
 /* supported DMA engine drivers */
-#include <linux/platform_data/dma-dw.h>
 #include <linux/dma/dw.h>
 
 #include <asm/page.h>
@@ -169,12 +168,6 @@ err:
        return ret;
 }
 
-static struct dw_dma_platform_data dw_pdata = {
-       .is_private = 1,
-       .chan_allocation_order = CHAN_ALLOCATION_ASCENDING,
-       .chan_priority = CHAN_PRIORITY_ASCENDING,
-};
-
 static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem,
        int irq)
 {
@@ -195,7 +188,8 @@ static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem,
                return ERR_PTR(err);
 
        chip->dev = dev;
-       err = dw_dma_probe(chip, &dw_pdata);
+
+       err = dw_dma_probe(chip, NULL);
        if (err)
                return ERR_PTR(err);