mmc: atmel: get rid of struct mci_dma_data

As struct mci_dma_data is now only used by AVR32, it is nothing but
pointless indirection.  Replace it with struct dw_dma_slave in the
AVR32 platform code and with a void pointer elsewhere.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Acked-by: Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>

1 files changed, 10 insertions, 11 deletions

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 6e906172dc33..bf445aa48282 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -17,7 +17,6 @@
 #include <linux/spi/spi.h>
 #include <linux/usb/atmel_usba_udc.h>
 
-#include <linux/platform_data/mmc-atmel-mci.h>
 #include <linux/atmel-mci.h>
 
 #include <asm/io.h>
@@ -1323,13 +1322,13 @@ static struct clk atmel_mci0_pclk = {
 
 static bool at32_mci_dma_filter(struct dma_chan *chan, void *pdata)
 {
-        struct mci_dma_data *sl = pdata;
+        struct dw_dma_slave *sl = pdata;
 
         if (!sl)
                 return false;
 
-        if (find_slave_dev(sl) == chan->device->dev) {
-                chan->private = slave_data_ptr(sl);
+        if (sl->dma_dev == chan->device->dev) {
+                chan->private = sl;
                 return true;
         }
 
@@ -1340,7 +1339,7 @@ struct platform_device *__init
 at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
 {
         struct platform_device          *pdev;
-        struct mci_dma_data             *slave;
+        struct dw_dma_slave             *slave;
         u32                             pioa_mask;
         u32                             piob_mask;
 
@@ -1359,15 +1358,15 @@ at32_add_device_mci(unsigned int id, struct mci_platform_data *data)
                                 ARRAY_SIZE(atmel_mci0_resource)))
                 goto fail;
 
-        slave = kzalloc(sizeof(struct mci_dma_data), GFP_KERNEL);
+        slave = kzalloc(sizeof(*slave), GFP_KERNEL);
         if (!slave)
                 goto fail;
 
-        slave->sdata.dma_dev = &dw_dmac0_device.dev;
-        slave->sdata.src_id = 0;
-        slave->sdata.dst_id = 1;
-        slave->sdata.src_master = 1;
-        slave->sdata.dst_master = 0;
+        slave->dma_dev = &dw_dmac0_device.dev;
+        slave->src_id = 0;
+        slave->dst_id = 1;
+        slave->src_master = 1;
+        slave->dst_master = 0;
 
         data->dma_slave = slave;
         data->dma_filter = at32_mci_dma_filter;