From: Philipp Hortmann Date: Wed, 13 Jul 2022 04:59:38 +0000 (+0200) Subject: staging: vt6655: Rename wBits to bit_mask in two macros X-Git-Tag: v6.0-rc1~132^2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd643b197ffbd039951a9475d8f887ec3f2beb6;p=thirdparty%2Flinux.git staging: vt6655: Rename wBits to bit_mask 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/8929407dc7355df515b7f9fdd195b45ff44f6b98.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3037502c18834..b8f543aef7163 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -544,11 +544,11 @@ do { \ iowrite8(byData | (bit_mask), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOn(iobase, reg_offset, wBits) \ +#define MACvWordRegBitsOn(iobase, reg_offset, bit_mask) \ do { \ unsigned short wData; \ wData = ioread16(iobase + reg_offset); \ - iowrite16(wData | (wBits), iobase + reg_offset); \ + iowrite16(wData | (bit_mask), iobase + reg_offset); \ } while (0) #define MACvRegBitsOff(iobase, reg_offset, bit_mask) \ @@ -558,11 +558,11 @@ do { \ iowrite8(byData & ~(bit_mask), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOff(iobase, reg_offset, wBits) \ +#define MACvWordRegBitsOff(iobase, reg_offset, bit_mask) \ do { \ unsigned short wData; \ wData = ioread16(iobase + reg_offset); \ - iowrite16(wData & ~(wBits), iobase + reg_offset); \ + iowrite16(wData & ~(bit_mask), iobase + reg_offset); \ } while (0) #define MACvReceive0(iobase) \