[PATCH 08/14] mmc: mmci: add get_next_data callback

[Ludovic Barre]

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

This patch adds get_next_data callback to mmci_host_ops.
Generic mmci_get_next_data factorizes next_cookie check and
the host ops call.

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

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 345aa2e..0193da6 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -390,6 +390,14 @@ void mmci_unprepare_data(struct mmci_host *host, struct 
mmc_data *data,
        data->host_cookie = 0;
 }
 
+void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
+{
+       WARN_ON(data->host_cookie && data->host_cookie != host->next_cookie);
+
+       if (host->ops && host->ops->get_next_data)
+               host->ops->get_next_data(host, data);
+}
+
 static void
 mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
 {
@@ -738,12 +746,11 @@ static int mmci_dma_start_data(struct mmci_host *host, 
unsigned int datactrl)
        return 0;
 }
 
-static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
+void mmci_dmae_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 != host->next_cookie);
        WARN_ON(!data->host_cookie && (next->dma_desc || next->dma_chan));
 
        dmae->dma_desc_current = next->dma_desc;
@@ -785,13 +792,10 @@ void mmci_dmae_unprepare_data(struct mmci_host *host,
 static struct mmci_host_ops mmci_variant_ops = {
        .prepare_data = mmci_dmae_prepare_data,
        .unprepare_data = mmci_dmae_unprepare_data,
+       .get_next_data = mmci_dmae_get_next_data,
 };
 #else
 /* Blank functions if the DMA engine is not available */
-static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
-{
-}
-
 static inline int mmci_dma_setup(struct mmci_host *host)
 {
        return 0;
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index fa2702b..bb1e4ba 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -277,6 +277,7 @@ struct mmci_host_ops {
                            bool next);
        void (*unprepare_data)(struct mmci_host *host, struct mmc_data *data,
                               int err);
+       void (*get_next_data)(struct mmci_host *host, struct mmc_data *data);
        int (*dma_setup)(struct mmci_host *host);
 };
 
@@ -333,3 +334,4 @@ int mmci_dmae_prepare_data(struct mmci_host *host, struct 
mmc_data *data,
                           bool next);
 void mmci_dmae_unprepare_data(struct mmci_host *host,
                              struct mmc_data *data, int err);
+void mmci_dmae_get_next_data(struct mmci_host *host, struct mmc_data *data);
diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c
index d534fa1..e4c505a 100644
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -182,6 +182,7 @@ static int qcom_dma_setup(struct mmci_host *host)
 static struct mmci_host_ops qcom_variant_ops = {
        .prepare_data = mmci_dmae_prepare_data,
        .unprepare_data = mmci_dmae_unprepare_data,
+       .get_next_data = mmci_dmae_get_next_data,
        .dma_setup = qcom_dma_setup,
 };
 
-- 
2.7.4