From 186c46008c9d563facd247e2d97d00a044a5870e Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 06:58:56 +0200 Subject: [PATCH] staging: vt6655: Rename byRegOfs to reg_offset in four macros Fix name of a variable in four macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/82f65d22ac8cd75b2c7790c13be3d0068968925b.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 5c14a76ed799b..b3803143673ca 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,32 +537,32 @@ /*--------------------- Export Macros ------------------------------*/ -#define MACvRegBitsOn(iobase, byRegOfs, byBits) \ +#define MACvRegBitsOn(iobase, reg_offset, byBits) \ do { \ unsigned char byData; \ - byData = ioread8(iobase + byRegOfs); \ - iowrite8(byData | (byBits), iobase + byRegOfs); \ + byData = ioread8(iobase + reg_offset); \ + iowrite8(byData | (byBits), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \ +#define MACvWordRegBitsOn(iobase, reg_offset, wBits) \ do { \ unsigned short wData; \ - wData = ioread16(iobase + byRegOfs); \ - iowrite16(wData | (wBits), iobase + byRegOfs); \ + wData = ioread16(iobase + reg_offset); \ + iowrite16(wData | (wBits), iobase + reg_offset); \ } while (0) -#define MACvRegBitsOff(iobase, byRegOfs, byBits) \ +#define MACvRegBitsOff(iobase, reg_offset, byBits) \ do { \ unsigned char byData; \ - byData = ioread8(iobase + byRegOfs); \ - iowrite8(byData & ~(byBits), iobase + byRegOfs); \ + byData = ioread8(iobase + reg_offset); \ + iowrite8(byData & ~(byBits), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \ +#define MACvWordRegBitsOff(iobase, reg_offset, wBits) \ do { \ unsigned short wData; \ - wData = ioread16(iobase + byRegOfs); \ - iowrite16(wData & ~(wBits), iobase + byRegOfs); \ + wData = ioread16(iobase + reg_offset); \ + iowrite16(wData & ~(wBits), iobase + reg_offset); \ } while (0) #define MACvReceive0(iobase) \ -- 2.30.2