From dd1b790e73e29a015caa93ab720aad2a1c190cfd Mon Sep 17 00:00:00 2001 From: Mariusz Kozlowski Date: Fri, 1 Dec 2006 20:19:59 -0800 Subject: [PATCH] --- yaml --- r: 44163 b: refs/heads/master c: 5ff42459af99427a393e3b576a77a900d43e730a h: refs/heads/master i: 44161: c6b577a416bdd7ef70aa0dec3696ff419c0c49cc 44159: ee8aaf56d589e71cfa2fb82959be087f83c7095b v: v3 --- [refs] | 2 +- trunk/include/asm-sparc64/dma.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ade6f597565a..24742793b441 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35bca36cf7b20a73a89f87aab34b1b4dfff6bf08 +refs/heads/master: 5ff42459af99427a393e3b576a77a900d43e730a diff --git a/trunk/include/asm-sparc64/dma.h b/trunk/include/asm-sparc64/dma.h index 27f65972b3bb..93e5a062df88 100644 --- a/trunk/include/asm-sparc64/dma.h +++ b/trunk/include/asm-sparc64/dma.h @@ -152,9 +152,9 @@ extern void dvma_init(struct sbus_bus *); #define DMA_MAXEND(addr) (0x01000000UL-(((unsigned long)(addr))&0x00ffffffUL)) /* Yes, I hack a lot of elisp in my spare time... */ -#define DMA_ERROR_P(regs) (((sbus_readl((regs) + DMA_CSR) & DMA_HNDL_ERROR)) -#define DMA_IRQ_P(regs) (((sbus_readl((regs) + DMA_CSR)) & (DMA_HNDL_INTR | DMA_HNDL_ERROR))) -#define DMA_WRITE_P(regs) (((sbus_readl((regs) + DMA_CSR) & DMA_ST_WRITE)) +#define DMA_ERROR_P(regs) ((sbus_readl((regs) + DMA_CSR) & DMA_HNDL_ERROR)) +#define DMA_IRQ_P(regs) ((sbus_readl((regs) + DMA_CSR)) & (DMA_HNDL_INTR | DMA_HNDL_ERROR)) +#define DMA_WRITE_P(regs) ((sbus_readl((regs) + DMA_CSR) & DMA_ST_WRITE)) #define DMA_OFF(__regs) \ do { u32 tmp = sbus_readl((__regs) + DMA_CSR); \ tmp &= ~DMA_ENABLE; \