atmel-mci: convert to dma_request_channel and down-level dma_slave

dma_request_channel provides an exclusive channel, so we no longer need to
pass slave data through dmaengine.

Cc: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

2 files changed, 6 insertions, 15 deletions

diff --git a/arch/avr32/include/asm/atmel-mci.h b/arch/avr32/include/asm/atmel-mci.h
index 59f3fadd0b68..e5e54c6f35d9 100644
--- a/arch/avr32/include/asm/atmel-mci.h
+++ b/arch/avr32/include/asm/atmel-mci.h
@@ -3,7 +3,7 @@
 
 #define ATMEL_MCI_MAX_NR_SLOTS  2
 
-struct dma_slave;
+#include <linux/dw_dmac.h>
 
 /**
  * struct mci_slot_pdata - board-specific per-slot configuration
@@ -28,11 +28,11 @@ struct mci_slot_pdata {
 
 /**
  * struct mci_platform_data - board-specific MMC/SDcard configuration
- * @dma_slave: DMA slave interface to use in data transfers, or NULL.
+ * @dma_slave: DMA slave interface to use in data transfers.
  * @slot: Per-slot configuration data.
  */
 struct mci_platform_data {
-        struct dma_slave        *dma_slave;
+        struct dw_dma_slave     dma_slave;
         struct mci_slot_pdata   slot[ATMEL_MCI_MAX_NR_SLOTS];
 };
 
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 066252eebf61..414f174e38cd 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1305,7 +1305,7 @@ struct platform_device *__init
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
         struct platform_device          *pdev;
-        struct dw_dma_slave             *dws;
+        struct dw_dma_slave             *dws = &data->dma_slave;
         u32                             pioa_mask;
         u32                             piob_mask;
 
@@ -1324,22 +1324,13 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
                                 ARRAY_SIZE(atmel_mci0_resource)))
                 goto fail;
 
-        if (data->dma_slave)
-                dws = kmemdup(to_dw_dma_slave(data->dma_slave),
-                                sizeof(struct dw_dma_slave), GFP_KERNEL);
-        else
-                dws = kzalloc(sizeof(struct dw_dma_slave), GFP_KERNEL);
-
-        dws->slave.dev = &pdev->dev;
-        dws->slave.dma_dev = &dw_dmac0_device.dev;
-        dws->slave.reg_width = DMA_SLAVE_WIDTH_32BIT;
+        dws->dma_dev = &dw_dmac0_device.dev;
+        dws->reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
         dws->cfg_hi = (DWC_CFGH_SRC_PER(0)
                                 | DWC_CFGH_DST_PER(1));
         dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL
                                 | DWC_CFGL_HS_SRC_POL);
 
-        data->dma_slave = &dws->slave;
-
         if (platform_device_add_data(pdev, data,
                                 sizeof(struct mci_platform_data)))
                 goto fail;