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>
This commit is contained in:

committed by
Hans-Christian Egtvedt

parent
7484378715
commit
238d1c6041
@@ -37,7 +37,7 @@ struct mci_slot_pdata {
|
||||
* @slot: Per-slot configuration data.
|
||||
*/
|
||||
struct mci_platform_data {
|
||||
struct mci_dma_data *dma_slave;
|
||||
void *dma_slave;
|
||||
dma_filter_fn dma_filter;
|
||||
struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS];
|
||||
};
|
||||
|
@@ -1,22 +0,0 @@
|
||||
#ifndef __MMC_ATMEL_MCI_H
|
||||
#define __MMC_ATMEL_MCI_H
|
||||
|
||||
#include <linux/platform_data/dma-atmel.h>
|
||||
#include <linux/platform_data/dma-dw.h>
|
||||
|
||||
/**
|
||||
* struct mci_dma_data - DMA data for MCI interface
|
||||
*/
|
||||
struct mci_dma_data {
|
||||
#ifdef CONFIG_ARM
|
||||
struct at_dma_slave sdata;
|
||||
#else
|
||||
struct dw_dma_slave sdata;
|
||||
#endif
|
||||
};
|
||||
|
||||
/* accessor macros */
|
||||
#define slave_data_ptr(s) (&(s)->sdata)
|
||||
#define find_slave_dev(s) ((s)->sdata.dma_dev)
|
||||
|
||||
#endif /* __MMC_ATMEL_MCI_H */
|
Reference in New Issue
Block a user