summaryrefslogtreecommitdiffstats
path: root/include/asm-cris/arch-v32
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2008-01-28 17:42:17 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:06:38 +0100
commit8d073287442fd8f56baadd4a17853931b8330e47 (patch)
tree39d62b099eba5cdd38e65186127144d4adcfdee8 /include/asm-cris/arch-v32
parent3fb18a3387ee5da0fb579db6e5707e4813e725cf (diff)
downloadop-kernel-dev-8d073287442fd8f56baadd4a17853931b8330e47.zip
op-kernel-dev-8d073287442fd8f56baadd4a17853931b8330e47.tar.gz
CRIS v32: Rename variable used in macro for arch-v32/hwregs/dma.h
The old name "r" would quite often produce warnings when other variables with the same name was shadowed. Rename it __x to make it more unlikely to happen.
Diffstat (limited to 'include/asm-cris/arch-v32')
-rw-r--r--include/asm-cris/arch-v32/hwregs/dma.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/include/asm-cris/arch-v32/hwregs/dma.h b/include/asm-cris/arch-v32/hwregs/dma.h
index c31832d..3ce322b 100644
--- a/include/asm-cris/arch-v32/hwregs/dma.h
+++ b/include/asm-cris/arch-v32/hwregs/dma.h
@@ -1,5 +1,4 @@
-/* $Id: dma.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
- *
+/*
* DMA C definitions and help macros
*
*/
@@ -98,11 +97,11 @@ typedef struct dma_descr_data {
// give stream command
#define DMA_WR_CMD( inst, cmd_par ) \
- do { reg_dma_rw_stream_cmd r = {0}; \
- do { r = REG_RD( dma, inst, rw_stream_cmd ); } while( r.busy ); \
- r.cmd = (cmd_par); \
- REG_WR( dma, inst, rw_stream_cmd, r ); \
- } while( 0 )
+ do { reg_dma_rw_stream_cmd __x = {0}; \
+ do { __x = REG_RD(dma, inst, rw_stream_cmd); } while (__x.busy); \
+ __x.cmd = (cmd_par); \
+ REG_WR(dma, inst, rw_stream_cmd, __x); \
+ } while (0)
// load: g,c,d:burst
#define DMA_START_GROUP( inst, group_descr ) \
OpenPOWER on IntegriCloud