Commit 1c3d5f6d authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson

mmc: sdhci: Use 'void *' for not 'u8 *' for ADMA data

It is kernel-style to use 'void *' for anonymous data.
This is being applied to the ADMA bounce buffer which
contains unaligned bytes, and to the ADMA descriptor
table which will contain 32-bit ADMA descriptors
or 64-bit ADMA descriptors when support is added.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b5ffa674
...@@ -454,7 +454,7 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags) ...@@ -454,7 +454,7 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags)
local_irq_restore(*flags); local_irq_restore(*flags);
} }
static void sdhci_adma_write_desc(u8 *desc, u32 addr, int len, unsigned cmd) static void sdhci_adma_write_desc(void *desc, u32 addr, int len, unsigned cmd)
{ {
__le32 *dataddr = (__le32 __force *)(desc + 4); __le32 *dataddr = (__le32 __force *)(desc + 4);
__le16 *cmdlen = (__le16 __force *)desc; __le16 *cmdlen = (__le16 __force *)desc;
...@@ -480,8 +480,8 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, ...@@ -480,8 +480,8 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
{ {
int direction; int direction;
u8 *desc; void *desc;
u8 *align; void *align;
dma_addr_t addr; dma_addr_t addr;
dma_addr_t align_addr; dma_addr_t align_addr;
int len, offset; int len, offset;
...@@ -606,7 +606,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host, ...@@ -606,7 +606,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host,
struct scatterlist *sg; struct scatterlist *sg;
int i, size; int i, size;
u8 *align; void *align;
char *buffer; char *buffer;
unsigned long flags; unsigned long flags;
bool has_unaligned; bool has_unaligned;
...@@ -2301,7 +2301,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask) ...@@ -2301,7 +2301,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask)
static void sdhci_adma_show_error(struct sdhci_host *host) static void sdhci_adma_show_error(struct sdhci_host *host)
{ {
const char *name = mmc_hostname(host->mmc); const char *name = mmc_hostname(host->mmc);
u8 *desc = host->adma_table; void *desc = host->adma_table;
__le32 *dma; __le32 *dma;
__le16 *len; __le16 *len;
u8 attr; u8 attr;
...@@ -2311,7 +2311,7 @@ static void sdhci_adma_show_error(struct sdhci_host *host) ...@@ -2311,7 +2311,7 @@ static void sdhci_adma_show_error(struct sdhci_host *host)
while (true) { while (true) {
dma = (__le32 *)(desc + 4); dma = (__le32 *)(desc + 4);
len = (__le16 *)(desc + 2); len = (__le16 *)(desc + 2);
attr = *desc; attr = *(u8 *)desc;
DBG("%s: %p: DMA 0x%08x, LEN 0x%04x, Attr=0x%02x\n", DBG("%s: %p: DMA 0x%08x, LEN 0x%04x, Attr=0x%02x\n",
name, desc, le32_to_cpu(*dma), le16_to_cpu(*len), attr); name, desc, le32_to_cpu(*dma), le16_to_cpu(*len), attr);
......
...@@ -155,8 +155,8 @@ struct sdhci_host { ...@@ -155,8 +155,8 @@ struct sdhci_host {
int sg_count; /* Mapped sg entries */ int sg_count; /* Mapped sg entries */
u8 *adma_table; /* ADMA descriptor table */ void *adma_table; /* ADMA descriptor table */
u8 *align_buffer; /* Bounce buffer */ void *align_buffer; /* Bounce buffer */
dma_addr_t adma_addr; /* Mapped ADMA descr. table */ dma_addr_t adma_addr; /* Mapped ADMA descr. table */
dma_addr_t align_addr; /* Mapped bounce buffer */ dma_addr_t align_addr; /* Mapped bounce buffer */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment