Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: vt6655: Rename MACvWordRegBitsOn

Fix name of a macro that uses CamelCase which is not
accepted by checkpatch.pl

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/b3873e1103d642a804d42c945dc0c73d94b0c1cf.1657657918.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Philipp Hortmann and committed by
Greg Kroah-Hartman
ee67fe63 67ec5576

+13 -13
+2 -2
drivers/staging/vt6655/card.c
··· 354 354 case RF_RFMD2959: 355 355 MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, 356 356 SOFTPWRCTL_TXPEINV); 357 - MACvWordRegBitsOn(priv->port_offset, MAC_REG_SOFTPWRCTL, 358 - SOFTPWRCTL_SWPE1); 357 + vt6655_mac_word_reg_bits_on(priv->port_offset, MAC_REG_SOFTPWRCTL, 358 + SOFTPWRCTL_SWPE1); 359 359 break; 360 360 361 361 case RF_AIROHA:
+2 -2
drivers/staging/vt6655/device_main.c
··· 359 359 } 360 360 361 361 /* use relative tx timeout and 802.11i D4 */ 362 - MACvWordRegBitsOn(priv->port_offset, 363 - MAC_REG_CFG, (CFG_TKIPOPT | CFG_NOTXTIMEOUT)); 362 + vt6655_mac_word_reg_bits_on(priv->port_offset, MAC_REG_CFG, 363 + (CFG_TKIPOPT | CFG_NOTXTIMEOUT)); 364 364 365 365 /* set performance parameter by registry */ 366 366 MACvSetShortRetryLimit(priv, priv->byShortRetryLimit);
+2 -2
drivers/staging/vt6655/mac.h
··· 544 544 iowrite8(reg_value | (bit_mask), iobase + reg_offset); \ 545 545 } while (0) 546 546 547 - #define MACvWordRegBitsOn(iobase, reg_offset, bit_mask) \ 547 + #define vt6655_mac_word_reg_bits_on(iobase, reg_offset, bit_mask) \ 548 548 do { \ 549 549 unsigned short reg_value; \ 550 550 reg_value = ioread16(iobase + reg_offset); \ ··· 661 661 } while (0) 662 662 663 663 #define MACvSetRFLE_LatchBase(iobase) \ 664 - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) 664 + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) 665 665 666 666 #define MAKEWORD(lb, hb) \ 667 667 ((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8)))
+7 -7
drivers/staging/vt6655/rf.c
··· 209 209 /* 3-wire control for normal mode */ 210 210 iowrite8(0, iobase + MAC_REG_SOFTPWRCTL); 211 211 212 - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI | 213 - SOFTPWRCTL_TXPEINV)); 212 + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, 213 + (SOFTPWRCTL_SWPECTI | SOFTPWRCTL_TXPEINV)); 214 214 /* PLL Off */ 215 215 MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); 216 216 ··· 222 222 MACvTimer0MicroSDelay(priv, 30); /* delay 30 us */ 223 223 224 224 /* PLL On */ 225 - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); 225 + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); 226 226 227 227 MACvTimer0MicroSDelay(priv, 150);/* 150us */ 228 228 ret &= IFRFbWriteEmbedded(priv, (0x00d80f00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW)); ··· 232 232 ret &= IFRFbWriteEmbedded(priv, 233 233 al2230_init_table[CB_AL2230_INIT_SEQ - 1]); 234 234 235 - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 | 236 - SOFTPWRCTL_SWPE2 | 237 - SOFTPWRCTL_SWPECTI | 238 - SOFTPWRCTL_TXPEINV)); 235 + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 | 236 + SOFTPWRCTL_SWPE2 | 237 + SOFTPWRCTL_SWPECTI | 238 + SOFTPWRCTL_TXPEINV)); 239 239 240 240 /* 3-wire control for power saving mode */ 241 241 iowrite8(PSSIG_WPE3 | PSSIG_WPE2, iobase + MAC_REG_PSPWRSIG);