Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48857d9b authored by Russell King's avatar Russell King Committed by Ulf Hansson
Browse files

mmc: sdhci: move sdhci_pre_dma_transfer() 



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

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f55c98f7

drivers/mmc/host/sdhci.c

+25 −27
Original line number Diff line number Diff line
@@ -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)

{