Message ID | 20190810121608.24145-2-paul@crapouillou.net (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/2] mmc: jz4740: Code cleanup | expand |
On Sat, 10 Aug 2019 at 14:16, Paul Cercueil <paul@crapouillou.net> wrote: > > We don't need to set the 'slave_id' anymore - that field is never read > by the DMA driver. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/jz4740_mmc.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c > index 59f81e8afcce..7ff2034d739a 100644 > --- a/drivers/mmc/host/jz4740_mmc.c > +++ b/drivers/mmc/host/jz4740_mmc.c > @@ -25,8 +25,6 @@ > > #include <asm/cacheflush.h> > > -#include <asm/mach-jz4740/dma.h> > - > #define JZ_REG_MMC_STRPCL 0x00 > #define JZ_REG_MMC_STATUS 0x04 > #define JZ_REG_MMC_CLKRT 0x08 > @@ -292,11 +290,9 @@ static int jz4740_mmc_start_dma_transfer(struct jz4740_mmc_host *host, > if (data->flags & MMC_DATA_WRITE) { > conf.direction = DMA_MEM_TO_DEV; > conf.dst_addr = host->mem_res->start + JZ_REG_MMC_TXFIFO; > - conf.slave_id = JZ4740_DMA_TYPE_MMC_TRANSMIT; > } else { > conf.direction = DMA_DEV_TO_MEM; > conf.src_addr = host->mem_res->start + JZ_REG_MMC_RXFIFO; > - conf.slave_id = JZ4740_DMA_TYPE_MMC_RECEIVE; > } > > sg_count = jz4740_mmc_prepare_dma_data(host, data, COOKIE_MAPPED); > -- > 2.21.0.593.g511ec345e18 >
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 59f81e8afcce..7ff2034d739a 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -25,8 +25,6 @@ #include <asm/cacheflush.h> -#include <asm/mach-jz4740/dma.h> - #define JZ_REG_MMC_STRPCL 0x00 #define JZ_REG_MMC_STATUS 0x04 #define JZ_REG_MMC_CLKRT 0x08 @@ -292,11 +290,9 @@ static int jz4740_mmc_start_dma_transfer(struct jz4740_mmc_host *host, if (data->flags & MMC_DATA_WRITE) { conf.direction = DMA_MEM_TO_DEV; conf.dst_addr = host->mem_res->start + JZ_REG_MMC_TXFIFO; - conf.slave_id = JZ4740_DMA_TYPE_MMC_TRANSMIT; } else { conf.direction = DMA_DEV_TO_MEM; conf.src_addr = host->mem_res->start + JZ_REG_MMC_RXFIFO; - conf.slave_id = JZ4740_DMA_TYPE_MMC_RECEIVE; } sg_count = jz4740_mmc_prepare_dma_data(host, data, COOKIE_MAPPED);
We don't need to set the 'slave_id' anymore - that field is never read by the DMA driver. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/mmc/host/jz4740_mmc.c | 4 ---- 1 file changed, 4 deletions(-)