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

Commit 08621b18 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Rename two ADMA-related functions for consistency 



Rename sdhci_set_adma_desc to sdhci_adma_write_desc and
sdhci_show_adma_error to sdhci_adma_show_error so that
all ADMA functions start with sdhci_adma_.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b521cf34

drivers/mmc/host/sdhci.c

+7 −7
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags) 
	local_irq_restore(*flags);

}



static void sdhci_set_adma_desc(u8 *desc, u32 addr, int len, unsigned cmd)

static void sdhci_adma_write_desc(u8 *desc, u32 addr, int len, unsigned cmd)

{

	__le32 *dataddr = (__le32 __force *)(desc + 4);

	__le16 *cmdlen = (__le16 __force *)desc;
@@ -532,7 +532,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, 
			}



			/* tran, valid */

			sdhci_set_adma_desc(desc, align_addr, offset, 0x21);

			sdhci_adma_write_desc(desc, align_addr, offset, 0x21);



			BUG_ON(offset > 65536);
@@ -548,7 +548,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, 
		BUG_ON(len > 65536);



		/* tran, valid */

		sdhci_set_adma_desc(desc, addr, len, 0x21);

		sdhci_adma_write_desc(desc, addr, len, 0x21);

		desc += 8;



		/*
@@ -572,7 +572,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, 
		*/



		/* nop, end, valid */

		sdhci_set_adma_desc(desc, 0, 0, 0x3);

		sdhci_adma_write_desc(desc, 0, 0, 0x3);

	}



	/*
@@ -2291,7 +2291,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask) 
}



#ifdef CONFIG_MMC_DEBUG

static void sdhci_show_adma_error(struct sdhci_host *host)

static void sdhci_adma_show_error(struct sdhci_host *host)

{

	const char *name = mmc_hostname(host->mmc);

	u8 *desc = host->adma_desc;
@@ -2316,7 +2316,7 @@ static void sdhci_show_adma_error(struct sdhci_host *host) 
	}

}

#else

static void sdhci_show_adma_error(struct sdhci_host *host) { }

static void sdhci_adma_show_error(struct sdhci_host *host) { }

#endif



static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
@@ -2379,7 +2379,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 
		host->data->error = -EILSEQ;

	else if (intmask & SDHCI_INT_ADMA_ERROR) {

		pr_err("%s: ADMA error\n", mmc_hostname(host->mmc));

		sdhci_show_adma_error(host);

		sdhci_adma_show_error(host);

		host->data->error = -EIO;

		if (host->ops->adma_workaround)

			host->ops->adma_workaround(host, intmask);