diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-01-28 11:42:17 -0500 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-08 05:06:38 -0500 |
| commit | 8d073287442fd8f56baadd4a17853931b8330e47 (patch) | |
| tree | 39d62b099eba5cdd38e65186127144d4adcfdee8 | |
| parent | 3fb18a3387ee5da0fb579db6e5707e4813e725cf (diff) | |
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.
| -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 @@ | |||
| 1 | /* $Id: dma.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ | 1 | /* |
| 2 | * | ||
| 3 | * DMA C definitions and help macros | 2 | * DMA C definitions and help macros |
| 4 | * | 3 | * |
| 5 | */ | 4 | */ |
| @@ -98,11 +97,11 @@ typedef struct dma_descr_data { | |||
| 98 | 97 | ||
| 99 | // give stream command | 98 | // give stream command |
| 100 | #define DMA_WR_CMD( inst, cmd_par ) \ | 99 | #define DMA_WR_CMD( inst, cmd_par ) \ |
| 101 | do { reg_dma_rw_stream_cmd r = {0}; \ | 100 | do { reg_dma_rw_stream_cmd __x = {0}; \ |
| 102 | do { r = REG_RD( dma, inst, rw_stream_cmd ); } while( r.busy ); \ | 101 | do { __x = REG_RD(dma, inst, rw_stream_cmd); } while (__x.busy); \ |
| 103 | r.cmd = (cmd_par); \ | 102 | __x.cmd = (cmd_par); \ |
| 104 | REG_WR( dma, inst, rw_stream_cmd, r ); \ | 103 | REG_WR(dma, inst, rw_stream_cmd, __x); \ |
| 105 | } while( 0 ) | 104 | } while (0) |
| 106 | 105 | ||
| 107 | // load: g,c,d:burst | 106 | // load: g,c,d:burst |
| 108 | #define DMA_START_GROUP( inst, group_descr ) \ | 107 | #define DMA_START_GROUP( inst, group_descr ) \ |