mmc: sdhci: move sdhci_pre_dma_transfer()

Move sdhci_pre_dma_transfer() to avoid needing to declare this function
before use.

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>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 54ab050bc47bcf4a41905e2e0febed35389a41b1..1278a8dfeebecbf299f581e9bb66ba700a5b48f2 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -53,8 +53,6 @@ static void sdhci_finish_data(struct sdhci_host *);
 static void sdhci_finish_command(struct sdhci_host *);
 static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode);
 static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable);
-static int sdhci_pre_dma_transfer(struct sdhci_host *host,
-                                       struct mmc_data *data);
 static int sdhci_do_get_cd(struct sdhci_host *host);
 
 #ifdef CONFIG_PM
@@ -428,6 +426,31 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
        DBG("PIO transfer complete.\n");
 }
 
+static int sdhci_pre_dma_transfer(struct sdhci_host *host,
+                                 struct mmc_data *data)
+{
+       int sg_count;
+
+       if (data->host_cookie == COOKIE_MAPPED) {
+               data->host_cookie = COOKIE_GIVEN;
+               return data->sg_count;
+       }
+
+       WARN_ON(data->host_cookie == COOKIE_GIVEN);
+
+       sg_count = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+                               data->flags & MMC_DATA_WRITE ?
+                               DMA_TO_DEVICE : DMA_FROM_DEVICE);
+
+       if (sg_count == 0)
+               return -ENOSPC;
+
+       data->sg_count = sg_count;
+       data->host_cookie = COOKIE_MAPPED;
+
+       return sg_count;
+}
+
 static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags)
 {
        local_irq_save(*flags);
@@ -2080,31 +2103,6 @@ static void sdhci_post_req(struct mmc_host *mmc, struct mmc_request *mrq,
        data->host_cookie = COOKIE_UNMAPPED;
 }
 
-static int sdhci_pre_dma_transfer(struct sdhci_host *host,
-                                      struct mmc_data *data)
-{
-       int sg_count;
-
-       if (data->host_cookie == COOKIE_MAPPED) {
-               data->host_cookie = COOKIE_GIVEN;
-               return data->sg_count;
-       }
-
-       WARN_ON(data->host_cookie == COOKIE_GIVEN);
-
-       sg_count = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
-                               data->flags & MMC_DATA_WRITE ?
-                               DMA_TO_DEVICE : DMA_FROM_DEVICE);
-
-       if (sg_count == 0)
-               return -ENOSPC;
-
-       data->sg_count = sg_count;
-       data->host_cookie = COOKIE_MAPPED;
-
-       return sg_count;
-}
-
 static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq,
                               bool is_first_req)
 {