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

staging: vt6655: Rename macro MACvSelectPage1

Rename MACvSelectPage1 macro to VT6655_MAC_SELECT_PAGE1 to avoid
CamelCase which is not accepted by checkpatch.pl and to clean up
namespace. Remove unnecessary line break.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/8aa03e089613d49be7acedcb60a19a0133e96baa.1661666677.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
8809cc88 54765727

+8 -9
+1 -1
drivers/staging/vt6655/card.c
··· 545 545 spin_lock_irqsave(&priv->lock, flags); 546 546 547 547 /* Set to Page1 */ 548 - MACvSelectPage1(priv->port_offset); 548 + VT6655_MAC_SELECT_PAGE1(priv->port_offset); 549 549 550 550 /* RSPINF_b_1 */ 551 551 vnt_get_phy_field(priv, 14,
+1 -1
drivers/staging/vt6655/channel.c
··· 116 116 spin_lock_irqsave(&priv->lock, flags); 117 117 118 118 /* set HW default power register */ 119 - MACvSelectPage1(priv->port_offset); 119 + VT6655_MAC_SELECT_PAGE1(priv->port_offset); 120 120 RFbSetPower(priv, RATE_1M, priv->byCurrentCh); 121 121 iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK); 122 122 RFbSetPower(priv, RATE_6M, priv->byCurrentCh);
+3 -3
drivers/staging/vt6655/device_main.c
··· 400 400 } 401 401 402 402 if (priv->local_id > REV_ID_VT3253_B1) { 403 - MACvSelectPage1(priv->port_offset); 403 + VT6655_MAC_SELECT_PAGE1(priv->port_offset); 404 404 405 405 iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1); 406 406 ··· 1587 1587 spin_lock_irqsave(&priv->lock, flags); 1588 1588 1589 1589 if (priv->mc_list_count > 2) { 1590 - MACvSelectPage1(priv->port_offset); 1590 + VT6655_MAC_SELECT_PAGE1(priv->port_offset); 1591 1591 1592 1592 iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0); 1593 1593 iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4); 1594 1594 1595 1595 VT6655_MAC_SELECT_PAGE0(priv->port_offset); 1596 1596 } else { 1597 - MACvSelectPage1(priv->port_offset); 1597 + VT6655_MAC_SELECT_PAGE1(priv->port_offset); 1598 1598 1599 1599 multicast = le64_to_cpu(multicast); 1600 1600 iowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0);
+2 -2
drivers/staging/vt6655/mac.c
··· 213 213 /* read page0 register */ 214 214 memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0); 215 215 216 - MACvSelectPage1(io_base); 216 + VT6655_MAC_SELECT_PAGE1(io_base); 217 217 218 218 /* read page1 register */ 219 219 memcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base, ··· 240 240 { 241 241 void __iomem *io_base = priv->port_offset; 242 242 243 - MACvSelectPage1(io_base); 243 + VT6655_MAC_SELECT_PAGE1(io_base); 244 244 /* restore page1 */ 245 245 memcpy_toio(io_base, cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, 246 246 MAC_MAX_CONTEXT_SIZE_PAGE1);
+1 -2
drivers/staging/vt6655/mac.h
··· 539 539 540 540 #define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, iobase + MAC_REG_PAGE1SEL) 541 541 542 - #define MACvSelectPage1(iobase) \ 543 - iowrite8(1, iobase + MAC_REG_PAGE1SEL) 542 + #define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, iobase + MAC_REG_PAGE1SEL) 544 543 545 544 #define MACvSetRFLE_LatchBase(iobase) \ 546 545 vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)