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>

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index a4ebe59df5b8176db5caefdc215151ef91039cb5..1b2ba6793ead92e5ec7a48009cf74219f26c2e1b 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -545,7 +545,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
        spin_lock_irqsave(&priv->lock, flags);
 
        /* Set to Page1 */
-       MACvSelectPage1(priv->port_offset);
+       VT6655_MAC_SELECT_PAGE1(priv->port_offset);
 
        /* RSPINF_b_1 */
        vnt_get_phy_field(priv, 14,

diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index ae6bf94936110299660df275c0b17b6fd200fbdf..4122875ebcaaab15fbbcfa61b1cbf50e243d8e01 100644 (file)
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -116,7 +116,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
                spin_lock_irqsave(&priv->lock, flags);
 
                /* set HW default power register */
-               MACvSelectPage1(priv->port_offset);
+               VT6655_MAC_SELECT_PAGE1(priv->port_offset);
                RFbSetPower(priv, RATE_1M, priv->byCurrentCh);
                iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK);
                RFbSetPower(priv, RATE_6M, priv->byCurrentCh);

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 283119bbe2fb2c2caf7ab8e824641b3f9b93f7c7..cd748b1665bb22f34ec28e31c4210b7438f162bf 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -400,7 +400,7 @@ static void device_init_registers(struct vnt_private *priv)
        }
 
        if (priv->local_id > REV_ID_VT3253_B1) {
-               MACvSelectPage1(priv->port_offset);
+               VT6655_MAC_SELECT_PAGE1(priv->port_offset);
 
                iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1);
 
@@ -1587,14 +1587,14 @@ static void vnt_configure(struct ieee80211_hw *hw,
                        spin_lock_irqsave(&priv->lock, flags);
 
                        if (priv->mc_list_count > 2) {
-                               MACvSelectPage1(priv->port_offset);
+                               VT6655_MAC_SELECT_PAGE1(priv->port_offset);
 
                                iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0);
                                iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4);
 
                                VT6655_MAC_SELECT_PAGE0(priv->port_offset);
                        } else {
-                               MACvSelectPage1(priv->port_offset);
+                               VT6655_MAC_SELECT_PAGE1(priv->port_offset);
 
                                multicast =  le64_to_cpu(multicast);
                                iowrite32((u32)multicast, priv->port_offset +  MAC_REG_MAR0);

diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 8485cd0a81c05c33021c032bfd2f85e73dce777d..742391b24afbcca82113a3cc429bf70cfb7896f4 100644 (file)
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -213,7 +213,7 @@ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf)
        /* read page0 register */
        memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0);
 
-       MACvSelectPage1(io_base);
+       VT6655_MAC_SELECT_PAGE1(io_base);
 
        /* read page1 register */
        memcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base,
@@ -240,7 +240,7 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf)
 {
        void __iomem *io_base = priv->port_offset;
 
-       MACvSelectPage1(io_base);
+       VT6655_MAC_SELECT_PAGE1(io_base);
        /* restore page1 */
        memcpy_toio(io_base, cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0,
                    MAC_MAX_CONTEXT_SIZE_PAGE1);

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index a14b38a96ec62903cf42b6a1ba880436afb5c11a..3af8abc305b14c0fa39dbc9319c1318c666bff23 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -539,8 +539,7 @@
 
 #define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, iobase + MAC_REG_PAGE1SEL)
 
-#define MACvSelectPage1(iobase)                                \
-       iowrite8(1, iobase + MAC_REG_PAGE1SEL)
+#define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, iobase + MAC_REG_PAGE1SEL)
 
 #define MACvSetRFLE_LatchBase(iobase)                                 \
        vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)