leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: sh_mmcif: remove slave_id settings for DMAEngine

Browse Source 
Current sh_mmcif sets dma_slave_config :: slave_id field for DMAEngine,
but it is no longer needed. Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Kuninori Morimoto 2015-02-17 01:47:01 +00:00 committed by Vinod Koul
parent 411fdaf846
commit 5f48dd0690
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/host/sh_mmcif.c
View File

@ -388,7 +388,7 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
{ {
struct dma_slave_config cfg = { 0, }; struct dma_slave_config cfg = { 0, };
struct dma_chan *chan; struct dma_chan *chan;
unsigned int slave_id; void *slave_data = NULL;
struct resource *res; struct resource *res;
dma_cap_mask_t mask; dma_cap_mask_t mask;
int ret; int ret;
@ -397,13 +397,12 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
dma_cap_set(DMA_SLAVE, mask); dma_cap_set(DMA_SLAVE, mask);
if (pdata) if (pdata)
slave_id = direction == DMA_MEM_TO_DEV slave_data = direction == DMA_MEM_TO_DEV ?
? pdata->slave_id_tx : pdata->slave_id_rx; (void *)pdata->slave_id_tx :
else (void *)pdata->slave_id_rx;
slave_id = 0;
chan = dma_request_slave_channel_compat(mask, shdma_chan_filter, chan = dma_request_slave_channel_compat(mask, shdma_chan_filter,
(void *)(unsigned long)slave_id, &host->pd->dev, slave_data, &host->pd->dev,
direction == DMA_MEM_TO_DEV ? "tx" : "rx"); direction == DMA_MEM_TO_DEV ? "tx" : "rx");
dev_dbg(&host->pd->dev, "%s: %s: got channel %p\n", __func__, dev_dbg(&host->pd->dev, "%s: %s: got channel %p\n", __func__,
@ -414,8 +413,6 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
res = platform_get_resource(host->pd, IORESOURCE_MEM, 0); res = platform_get_resource(host->pd, IORESOURCE_MEM, 0);
/* In the OF case the driver will get the slave ID from the DT */
cfg.slave_id = slave_id;
cfg.direction = direction; cfg.direction = direction;
if (direction == DMA_DEV_TO_MEM) { if (direction == DMA_DEV_TO_MEM) {