diff options
| author | Russell King | 2016-01-26 14:40:27 +0100 |
|---|---|---|
| committer | Ulf Hansson | 2016-02-29 11:03:21 +0100 |
| commit | c0999b720c4f9c34cf10f79caf71bf8c1a246390 (patch) | |
| tree | 02ef22877c167fde662c8b9a98f06700c3c38cc4 /drivers/mmc/host/sdhci.c | |
| parent | mmc: sdhci: factor out sdhci_pre_dma_transfer() from sdhci_adma_table_pre() (diff) | |
| download | kernel-qcow2-linux-c0999b720c4f9c34cf10f79caf71bf8c1a246390.tar.gz kernel-qcow2-linux-c0999b720c4f9c34cf10f79caf71bf8c1a246390.tar.xz kernel-qcow2-linux-c0999b720c4f9c34cf10f79caf71bf8c1a246390.zip | |
mmc: sdhci: pass the cookie into sdhci_pre_dma_transfer()
Pass the desired cookie for a successful map. This is in preparation to
clean up the MAPPED/GIVEN states.
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/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 8b455cdd940b..9321d4a5b4e6 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -427,7 +427,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host) } static int sdhci_pre_dma_transfer(struct sdhci_host *host, - struct mmc_data *data) + struct mmc_data *data, int cookie) { int sg_count; @@ -446,7 +446,7 @@ static int sdhci_pre_dma_transfer(struct sdhci_host *host, return -ENOSPC; data->sg_count = sg_count; - data->host_cookie = COOKIE_MAPPED; + data->host_cookie = cookie; return sg_count; } @@ -791,7 +791,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) } if (host->flags & SDHCI_REQ_USE_DMA) { - int sg_cnt = sdhci_pre_dma_transfer(host, data); + int sg_cnt = sdhci_pre_dma_transfer(host, data, COOKIE_MAPPED); if (sg_cnt <= 0) { /* @@ -2095,7 +2095,7 @@ static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq, mrq->data->host_cookie = COOKIE_UNMAPPED; if (host->flags & SDHCI_REQ_USE_DMA) - sdhci_pre_dma_transfer(host, mrq->data); + sdhci_pre_dma_transfer(host, mrq->data, COOKIE_MAPPED); } static void sdhci_card_event(struct mmc_host *mmc) |