[PATCH V2 03/27] mmc: mmci: convert dma_setup callback to return an int

[Ludovic Barre]

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

This patch converts dma_setup callback to return an integer
This patch is needed to prepare sdmmc variant with internal dma

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 |  6 ++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 7d22cb9..077d4a7 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -415,7 +415,7 @@ static void mmci_init_sg(struct mmci_host *host, struct 
mmc_data *data)
  * no custom DMA interfaces are supported.
  */
 #ifdef CONFIG_DMA_ENGINE
-static void mmci_dma_setup(struct mmci_host *host)
+static int mmci_dma_setup(struct mmci_host *host)
 {
        const char *rxname, *txname;
 
@@ -466,7 +466,9 @@ static void mmci_dma_setup(struct mmci_host *host)
        }
 
        if (host->ops && host->ops->dma_setup)
-               host->ops->dma_setup(host);
+               return host->ops->dma_setup(host);
+
+       return 0;
 }
 
 /*
@@ -515,7 +517,7 @@ static void mmci_dma_finalize(struct mmci_host *host, 
struct mmc_data *data)
        u32 status;
        int i;
 
-       if (!__dma_inprogress(dmae))
+       if (!__dma_inprogress(host))
                return;
 
        /* Wait up to 1ms for the DMA to complete */
@@ -741,8 +743,10 @@ static void mmci_post_request(struct mmc_host *mmc, struct 
mmc_request *mrq,
 static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
 {
 }
-static inline void mmci_dma_setup(struct mmci_host *host)
+
+static inline int mmci_dma_setup(struct mmci_host *host)
 {
+       return 0;
 }
 
 static inline void mmci_dma_release(struct mmci_host *host)
@@ -1796,7 +1800,9 @@ static int mmci_probe(struct amba_device *dev,
                 amba_rev(dev), (unsigned long long)dev->res.start,
                 dev->irq[0], dev->irq[1]);
 
-       mmci_dma_setup(host);
+       ret = mmci_dma_setup(host);
+       if (ret)
+               goto clk_disable;
 
        pm_runtime_set_autosuspend_delay(&dev->dev, 50);
        pm_runtime_use_autosuspend(&dev->dev);
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index f1ec066..312ad5c 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -273,7 +273,7 @@ struct variant_data {
 
 /* mmci variant callbacks */
 struct mmci_host_ops {
-       void (*dma_setup)(struct mmci_host *host);
+       int (*dma_setup)(struct mmci_host *host);
 };
 
 struct mmci_host_next {
diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c
index be3fab5..1bb59cf 100644
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -119,7 +119,7 @@ static int of_get_dml_pipe_index(struct device_node *np, 
const char *name)
 }
 
 /* Initialize the dml hardware connected to SD Card controller */
-static void qcom_dma_setup(struct mmci_host *host)
+static int qcom_dma_setup(struct mmci_host *host)
 {
        u32 config;
        void __iomem *base;
@@ -131,7 +131,7 @@ static void qcom_dma_setup(struct mmci_host *host)
 
        if (producer_id < 0 || consumer_id < 0) {
                host->variant->qcom_dml = false;
-               return;
+               return -EINVAL;
        }
 
        base = host->base + DML_OFFSET;
@@ -175,6 +175,8 @@ static void qcom_dma_setup(struct mmci_host *host)
 
        /* Make sure dml initialization is finished */
        mb();
+
+       return 0;
 }
 
 static struct mmci_host_ops qcom_variant_ops = {
-- 
2.7.4