From 78f350830eb3b1b5c03c591f58b22110454556c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Tue, 24 Apr 2018 20:01:25 +0200 Subject: [PATCH] staging: mt7621-mmc: Replace dma dir with mmc_get_dma_dir MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Currently the dma direction is manually determined by the read status, there is a more portable function for it, mmc_get_dma_dir, use it. Signed-off-by: Christian Lütke-Stetzkamp Reviewed-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mt7621-mmc/sd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c index f11eb1f..e100c17 100644 --- a/drivers/staging/mt7621-mmc/sd.c +++ b/drivers/staging/mt7621-mmc/sd.c @@ -1360,7 +1360,7 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq) u32 base = host->base; //u32 intsts = 0; unsigned int left = 0; - int dma = 0, read = 1, dir = DMA_FROM_DEVICE, send_type = 0; + int dma = 0, read = 1, send_type = 0; #define SND_DAT 0 #define SND_CMD 1 @@ -1422,9 +1422,9 @@ static int msdc_do_request(struct mmc_host *mmc, struct mmc_request *mrq) if (msdc_command_start(host, cmd, 1, CMD_TIMEOUT) != 0) goto done; - dir = read ? DMA_FROM_DEVICE : DMA_TO_DEVICE; data->sg_count = dma_map_sg(mmc_dev(mmc), data->sg, - data->sg_len, dir); + data->sg_len, + mmc_get_dma_dir(data)); msdc_dma_setup(host, &host->dma, data->sg, data->sg_count); @@ -1505,7 +1505,8 @@ done: host->dma_xfer = 0; if (dma != 0) { msdc_dma_off(); - dma_unmap_sg(mmc_dev(mmc), data->sg, data->sg_len, dir); + dma_unmap_sg(mmc_dev(mmc), data->sg, data->sg_len, + mmc_get_dma_dir(data)); } host->blksz = 0; -- 2.7.4