Skip to content

Commit

Permalink
mmc: sh_mmcif: remove slave_id settings for DMAEngine
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kuninori Morimoto authored and Vinod Koul committed Feb 23, 2015
1 parent 411fdaf commit 5f48dd0
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/mmc/host/sh_mmcif.c
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
{
struct dma_slave_config cfg = { 0, };
struct dma_chan *chan;
unsigned int slave_id;
void *slave_data = NULL;
struct resource *res;
dma_cap_mask_t mask;
int ret;
Expand All @@ -397,13 +397,12 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,
dma_cap_set(DMA_SLAVE, mask);

if (pdata)
slave_id = direction == DMA_MEM_TO_DEV
? pdata->slave_id_tx : pdata->slave_id_rx;
else
slave_id = 0;
slave_data = direction == DMA_MEM_TO_DEV ?
(void *)pdata->slave_id_tx :
(void *)pdata->slave_id_rx;

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");

dev_dbg(&host->pd->dev, "%s: %s: got channel %p\n", __func__,
Expand All @@ -414,8 +413,6 @@ sh_mmcif_request_dma_one(struct sh_mmcif_host *host,

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;

if (direction == DMA_DEV_TO_MEM) {
Expand Down

0 comments on commit 5f48dd0

Please sign in to comment.