[PATCH 05/14] mmc: mmci: move mmci next cookie to mci host

[Ludovic Barre]

From: Ludovic Barre <ludovic.ba...@st.com>

This patch moves next cookie to mmci host structure to
share same cookie management between all variants.

Signed-off-by: Ludovic Barre <ludovic.ba...@st.com>
---
 drivers/mmc/host/mmci.c | 10 ++++------
 drivers/mmc/host/mmci.h |  2 ++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index bdc48c3..5646c2e6 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -418,7 +418,6 @@ static void mmci_init_sg(struct mmci_host *host, struct 
mmc_data *data)
 struct dmaengine_next {
        struct dma_async_tx_descriptor *dma_desc;
        struct dma_chan *dma_chan;
-       s32 cookie;
 };
 
 struct dmaengine_priv {
@@ -449,7 +448,7 @@ static int mmci_dma_setup(struct mmci_host *host)
                                                         "tx");
 
        /* initialize pre request cookie */
-       dmae->next_data.cookie = 1;
+       host->next_cookie = 1;
 
        /*
         * If only an RX channel is specified, the driver will
@@ -716,7 +715,7 @@ static void mmci_get_next_data(struct mmci_host *host, 
struct mmc_data *data)
        struct dmaengine_priv *dmae = host->dma_priv;
        struct dmaengine_next *next = &dmae->next_data;
 
-       WARN_ON(data->host_cookie && data->host_cookie != next->cookie);
+       WARN_ON(data->host_cookie && data->host_cookie != host->next_cookie);
        WARN_ON(!data->host_cookie && (next->dma_desc || next->dma_chan));
 
        dmae->dma_desc_current = next->dma_desc;
@@ -728,9 +727,7 @@ static void mmci_get_next_data(struct mmci_host *host, 
struct mmc_data *data)
 static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)
 {
        struct mmci_host *host = mmc_priv(mmc);
-       struct dmaengine_priv *dmae = host->dma_priv;
        struct mmc_data *data = mrq->data;
-       struct dmaengine_next *nd = &dmae->next_data;
 
        if (!data)
                return;
@@ -741,7 +738,8 @@ static void mmci_pre_request(struct mmc_host *mmc, struct 
mmc_request *mrq)
                return;
 
        if (!mmci_dma_prep_next(host, data))
-               data->host_cookie = ++nd->cookie < 0 ? 1 : nd->cookie;
+               data->host_cookie = ++host->next_cookie < 0 ?
+                       1 : host->next_cookie;
 }
 
 static void mmci_post_request(struct mmc_host *mmc, struct mmc_request *mrq,
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 260a1de..d2ec4fd 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -318,6 +318,8 @@ struct mmci_host {
        int (*get_rx_fifocnt)(struct mmci_host *h, u32 status, int remain);
 
        void                    *dma_priv;
+
+       s32                     next_cookie;
 };
 
 void qcom_variant_init(struct mmci_host *host);
-- 
2.7.4