diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-01-28 19:42:17 +0300 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-08 13:06:38 +0300 |
| commit | 8d073287442fd8f56baadd4a17853931b8330e47 (patch) | |
| tree | 39d62b099eba5cdd38e65186127144d4adcfdee8 /include/asm-cris | |
| parent | 3fb18a3387ee5da0fb579db6e5707e4813e725cf (diff) | |
| download | linux-8d073287442fd8f56baadd4a17853931b8330e47.tar.xz | |
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')
| -rw-r--r-- | include/asm-cris/arch-v32/hwregs/dma.h | 13 |
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 c31832d3d6be..3ce322b5c731 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 ) \ |