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

staging: vt6655: Rename MACvRegBitsOn

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/7fb9627441ff97897d132c62d59676355b6d14ea.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
67ec5576 ee9aded6

+24 -28
+4 -4
drivers/staging/vt6655/baseband.c
··· 1912 1912 iowrite8(by_bb_addr, iobase + MAC_REG_BBREGADR); 1913 1913 1914 1914 /* turn on REGR */ 1915 - MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); 1915 + vt6655_mac_reg_bits_on(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); 1916 1916 /* W_MAX_TIMEOUT is the timeout period */ 1917 1917 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { 1918 1918 by_value = ioread8(iobase + MAC_REG_BBREGCTL); ··· 1957 1957 iowrite8(by_data, iobase + MAC_REG_BBREGDATA); 1958 1958 1959 1959 /* turn on BBREGCTL_REGW */ 1960 - MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); 1960 + vt6655_mac_reg_bits_on(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); 1961 1961 /* W_MAX_TIMEOUT is the timeout period */ 1962 1962 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { 1963 1963 by_value = ioread8(iobase + MAC_REG_BBREGCTL); ··· 2014 2014 byVT3253B0_AGC4_RFMD2959[ii][1]); 2015 2015 2016 2016 iowrite32(0x23, iobase + MAC_REG_ITRTMSET); 2017 - MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); 2017 + vt6655_mac_reg_bits_on(iobase, MAC_REG_PAPEDELAY, BIT(0)); 2018 2018 } 2019 2019 priv->abyBBVGA[0] = 0x18; 2020 2020 priv->abyBBVGA[1] = 0x0A; ··· 2054 2054 byVT3253B0_AGC[ii][1]); 2055 2055 2056 2056 iowrite8(0x23, iobase + MAC_REG_ITRTMSET); 2057 - MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); 2057 + vt6655_mac_reg_bits_on(iobase, MAC_REG_PAPEDELAY, BIT(0)); 2058 2058 2059 2059 priv->abyBBVGA[0] = 0x14; 2060 2060 priv->abyBBVGA[1] = 0x0A;
+6 -8
drivers/staging/vt6655/card.c
··· 296 296 qwTSFOffset = le64_to_cpu(qwTSFOffset); 297 297 iowrite32((u32)qwTSFOffset, priv->port_offset + MAC_REG_TSFOFST); 298 298 iowrite32((u32)(qwTSFOffset >> 32), priv->port_offset + MAC_REG_TSFOFST + 4); 299 - MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, 300 - TFTCTL_TSFSYNCEN); 299 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN); 301 300 } 302 301 return true; 303 302 } ··· 330 331 qwNextTBTT = le64_to_cpu(qwNextTBTT); 331 332 iowrite32((u32)qwNextTBTT, priv->port_offset + MAC_REG_NEXTTBTT); 332 333 iowrite32((u32)(qwNextTBTT >> 32), priv->port_offset + MAC_REG_NEXTTBTT + 4); 333 - MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 334 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 334 335 335 336 return true; 336 337 } ··· 373 374 374 375 priv->radio_off = true; 375 376 pr_debug("chester power off\n"); 376 - MACvRegBitsOn(priv->port_offset, MAC_REG_GPIOCTL0, 377 - LED_ACTSET); /* LED issue */ 377 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_GPIOCTL0, LED_ACTSET); /* LED issue */ 378 378 } 379 379 380 380 void CARDvSafeResetTx(struct vnt_private *priv) ··· 732 734 unsigned char data; 733 735 u32 low, high; 734 736 735 - MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); 737 + vt6655_mac_reg_bits_on(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); 736 738 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { 737 739 data = ioread8(iobase + MAC_REG_TFTCTL); 738 740 if (!(data & TFTCTL_TSFCNTRRD)) ··· 798 800 qwNextTBTT = le64_to_cpu(qwNextTBTT); 799 801 iowrite32((u32)qwNextTBTT, iobase + MAC_REG_NEXTTBTT); 800 802 iowrite32((u32)(qwNextTBTT >> 32), iobase + MAC_REG_NEXTTBTT + 4); 801 - MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 803 + vt6655_mac_reg_bits_on(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 802 804 } 803 805 804 806 /* ··· 825 827 qwTSF = le64_to_cpu(qwTSF); 826 828 iowrite32((u32)qwTSF, iobase + MAC_REG_NEXTTBTT); 827 829 iowrite32((u32)(qwTSF >> 32), iobase + MAC_REG_NEXTTBTT + 4); 828 - MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 830 + vt6655_mac_reg_bits_on(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 829 831 pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF); 830 832 }
+1 -1
drivers/staging/vt6655/channel.c
··· 94 94 } 95 95 96 96 /* clear NAV */ 97 - MACvRegBitsOn(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); 97 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); 98 98 99 99 /* TX_PE will reserve 3 us for MAX2829 A mode only, 100 100 * it is for better TX throughput
+4 -5
drivers/staging/vt6655/device_main.c
··· 417 417 CARDvSafeResetTx(priv); 418 418 419 419 if (priv->local_id <= REV_ID_VT3253_A1) 420 - MACvRegBitsOn(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); 420 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); 421 421 422 422 /* Turn On Rx DMA */ 423 423 MACvReceive0(priv->port_offset); ··· 1324 1324 case NL80211_IFTYPE_ADHOC: 1325 1325 MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); 1326 1326 1327 - MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); 1327 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); 1328 1328 1329 1329 break; 1330 1330 case NL80211_IFTYPE_AP: 1331 1331 MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); 1332 1332 1333 - MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); 1333 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); 1334 1334 1335 1335 break; 1336 1336 default: ··· 1476 1476 if (conf->enable_beacon) { 1477 1477 vnt_beacon_enable(priv, vif, conf); 1478 1478 1479 - MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, 1480 - TCR_AUTOBCNTX); 1479 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); 1481 1480 } else { 1482 1481 MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, 1483 1482 TCR_AUTOBCNTX);
+1 -1
drivers/staging/vt6655/mac.h
··· 537 537 538 538 /*--------------------- Export Macros ------------------------------*/ 539 539 540 - #define MACvRegBitsOn(iobase, reg_offset, bit_mask) \ 540 + #define vt6655_mac_reg_bits_on(iobase, reg_offset, bit_mask) \ 541 541 do { \ 542 542 unsigned char reg_value; \ 543 543 reg_value = ioread8(iobase + reg_offset); \
+7 -8
drivers/staging/vt6655/power.c
··· 59 59 } 60 60 61 61 /* Set AutoSleep */ 62 - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); 62 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); 63 63 64 64 /* Set HWUTSF */ 65 - MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); 65 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); 66 66 67 67 if (wListenInterval >= 2) { 68 68 /* clear always listen beacon */ 69 69 MACvRegBitsOff(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); 70 70 /* first time set listen next beacon */ 71 - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); 71 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); 72 72 } else { 73 73 /* always listen beacon */ 74 - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); 74 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); 75 75 } 76 76 77 77 /* enable power saving hw function */ 78 - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_PSEN); 78 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_PSEN); 79 79 priv->bEnablePSMode = true; 80 80 81 81 priv->bPWBitOn = true; ··· 104 104 MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); 105 105 106 106 /* set always listen beacon */ 107 - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); 107 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); 108 108 109 109 priv->bEnablePSMode = false; 110 110 ··· 135 135 136 136 if (priv->wake_up_count == 1) { 137 137 /* Turn on wake up to listen next beacon */ 138 - MACvRegBitsOn(priv->port_offset, 139 - MAC_REG_PSCTL, PSCTL_LNBCN); 138 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); 140 139 wake_up = true; 141 140 } 142 141 }
+1 -1
drivers/staging/vt6655/rxtx.c
··· 1424 1424 1425 1425 iowrite16(priv->wBCNBufLen, priv->port_offset + MAC_REG_BCNDMACTL + 2); 1426 1426 /* Set auto Transmit on */ 1427 - MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); 1427 + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); 1428 1428 /* Poll Transmit the adapter */ 1429 1429 iowrite8(BEACON_READY, priv->port_offset + MAC_REG_BCNDMACTL); 1430 1430