mmc: sh_mmcif: remove slave_id settings for DMAEngine

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>

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 7d9d6a321521..26b7889febb2 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -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;
@@ -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__,
@@ -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) {