hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2014-11-04 12:42:41 +02:00 committed by Ulf Hansson
parent b5ffa6749c
commit 1c3d5f6ddc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mmc/host/sdhci.c
View File

@ -454,7 +454,7 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *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);
__le16 *cmdlen = (__le16 __force *)desc;
@ -480,8 +480,8 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
{
int direction;
u8 *desc;
u8 *align;
void *desc;
void *align;
dma_addr_t addr;
dma_addr_t align_addr;
int len, offset;
@ -606,7 +606,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host,
struct scatterlist *sg;
int i, size;
u8 *align;
void *align;
char *buffer;
unsigned long flags;
bool has_unaligned;
@ -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)
{
const char *name = mmc_hostname(host->mmc);
u8 *desc = host->adma_table;
void *desc = host->adma_table;
__le32 *dma;
__le16 *len;
u8 attr;
@ -2311,7 +2311,7 @@ static void sdhci_adma_show_error(struct sdhci_host *host)
while (true) {
dma = (__le32 *)(desc + 4);
len = (__le16 *)(desc + 2);
attr = *desc;
attr = *(u8 *)desc;
DBG("%s: %p: DMA 0x%08x, LEN 0x%04x, Attr=0x%02x\n",
name, desc, le32_to_cpu(*dma), le16_to_cpu(*len), attr);

4
include/linux/mmc/sdhci.h
View File

@ -155,8 +155,8 @@ struct sdhci_host {
int sg_count; /* Mapped sg entries */
u8 *adma_table; /* ADMA descriptor table */
u8 *align_buffer; /* Bounce buffer */
void *adma_table; /* ADMA descriptor table */
void *align_buffer; /* Bounce buffer */
dma_addr_t adma_addr; /* Mapped ADMA descr. table */
dma_addr_t align_addr; /* Mapped bounce buffer */