diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2016-01-26 13:40:11 +0000 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2016-02-29 11:03:19 +0100 |
| commit | f55c98f7466c2e52125d6ffd69295c0158ac609a (patch) | |
| tree | 825201d7a1d8237ed42d3830a713249946da7d3e /drivers/mmc | |
| parent | mmc: sdhci: avoid walking SG list for writes (diff) | |
| download | linux-dev-f55c98f7466c2e52125d6ffd69295c0158ac609a.tar.xz linux-dev-f55c98f7466c2e52125d6ffd69295c0158ac609a.zip | |
mmc: sdhci: factor out common DMA cleanup in sdhci_finish_data()
sdhci_finish_data() has two paths which result in identical DMA cleanup.
One is when SDHCI_USE_ADMA is clear, and the other is just before when
SDHCI_USE_ADMA is set, and is performed within sdhci_adma_table_post().
Simplify the code by removing the 'else' and eliminating the duplicate
inside sdhci_adma_table_post().
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index b28aa0f0276b..54ab050bc47b 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -552,19 +552,12 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, static void sdhci_adma_table_post(struct sdhci_host *host, struct mmc_data *data) { - int direction; - struct scatterlist *sg; int i, size; void *align; char *buffer; unsigned long flags; - if (data->flags & MMC_DATA_READ) - direction = DMA_FROM_DEVICE; - else - direction = DMA_TO_DEVICE; - if (data->flags & MMC_DATA_READ) { bool has_unaligned = false; @@ -577,7 +570,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host, if (has_unaligned) { dma_sync_sg_for_cpu(mmc_dev(host->mmc), data->sg, - data->sg_len, direction); + data->sg_len, DMA_FROM_DEVICE); align = host->align_buffer; @@ -595,12 +588,6 @@ static void sdhci_adma_table_post(struct sdhci_host *host, } } } - - if (data->host_cookie == COOKIE_MAPPED) { - dma_unmap_sg(mmc_dev(host->mmc), data->sg, - data->sg_len, direction); - data->host_cookie = COOKIE_UNMAPPED; - } } static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) @@ -920,14 +907,12 @@ static void sdhci_finish_data(struct sdhci_host *host) if (host->flags & SDHCI_REQ_USE_DMA) { if (host->flags & SDHCI_USE_ADMA) sdhci_adma_table_post(host, data); - else { - if (data->host_cookie == COOKIE_MAPPED) { - dma_unmap_sg(mmc_dev(host->mmc), - data->sg, data->sg_len, - (data->flags & MMC_DATA_READ) ? - DMA_FROM_DEVICE : DMA_TO_DEVICE); - data->host_cookie = COOKIE_UNMAPPED; - } + + if (data->host_cookie == COOKIE_MAPPED) { + dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len, + (data->flags & MMC_DATA_READ) ? + DMA_FROM_DEVICE : DMA_TO_DEVICE); + data->host_cookie = COOKIE_UNMAPPED; } } |