[PATCH v4 15/25] mmc: sdhci: pass the cookie into sdhci_pre_dma_transfer()

Russell King
2016-01-29T09:50:10Z

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>
---
drivers/mmc/host/sdhci.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c07d4296ee19..bd7fffa5b317 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;
}
@@ -780,7 +780,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) {
/*
@@ -2085,7 +2085,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)
--
2.1.0