From ee9aded6d39a3d78eb832a5eef0bf31286332e03 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:00:12 +0200 Subject: staging: vt6655: Rename wData to reg_value in two macros Fix name of a variable in two macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/8f2e9451a24e380c997fcf7c87249f7ed9b66787.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/staging/vt6655') 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) \ -- cgit v1.2.3-59-g8ed1b