aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r--drivers/staging/vt6655/mac.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 16c18a1ed22e..2a31c94156b2 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -546,9 +546,9 @@ do { \
#define MACvWordRegBitsOn(iobase, reg_offset, bit_mask) \
do { \
- unsigned short wData; \
- wData = ioread16(iobase + reg_offset); \
- iowrite16(wData | (bit_mask), iobase + reg_offset); \
+ unsigned short reg_value; \
+ reg_value = ioread16(iobase + reg_offset); \
+ iowrite16(reg_value | (bit_mask), iobase + reg_offset); \
} while (0)
#define MACvRegBitsOff(iobase, reg_offset, bit_mask) \
@@ -560,9 +560,9 @@ do { \
#define MACvWordRegBitsOff(iobase, reg_offset, bit_mask) \
do { \
- unsigned short wData; \
- wData = ioread16(iobase + reg_offset); \
- iowrite16(wData & ~(bit_mask), iobase + reg_offset); \
+ unsigned short reg_value; \
+ reg_value = ioread16(iobase + reg_offset); \
+ iowrite16(reg_value & ~(bit_mask), iobase + reg_offset); \
} while (0)
#define MACvReceive0(iobase) \