staging: vt6655: Rename macro MACvSelectPage0

Rename MACvSelectPage0 macro to VT6655_MAC_SELECT_PAGE0 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/a656aa0e04c43654ba22b764cb00e27898efbe5f.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 c442a1e580ab746e63700c912f63e05b26667bbc..a4ebe59df5b8176db5caefdc215151ef91039cb5 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -643,7 +643,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
                                   &byRsvTime);
        iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPINF_A_72);
        /* Set to Page0 */
-       MACvSelectPage0(priv->port_offset);
+       VT6655_MAC_SELECT_PAGE0(priv->port_offset);
 
        spin_unlock_irqrestore(&priv->lock, flags);
 }

diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index e926f9829a1590fa5d1aa0f640e24b1183fc2d72..ae6bf94936110299660df275c0b17b6fd200fbdf 100644 (file)
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -121,7 +121,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
                iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK);
                RFbSetPower(priv, RATE_6M, priv->byCurrentCh);
                iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWROFDM);
-               MACvSelectPage0(priv->port_offset);
+               VT6655_MAC_SELECT_PAGE0(priv->port_offset);
 
                spin_unlock_irqrestore(&priv->lock, flags);
        }

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 8e2a976aaaad404490e51c62e41876b60e5f8731..283119bbe2fb2c2caf7ab8e824641b3f9b93f7c7 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -404,7 +404,7 @@ static void device_init_registers(struct vnt_private *priv)
 
                iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1);
 
-               MACvSelectPage0(priv->port_offset);
+               VT6655_MAC_SELECT_PAGE0(priv->port_offset);
        }
 
        /* use relative tx timeout and 802.11i D4 */
@@ -1592,7 +1592,7 @@ static void vnt_configure(struct ieee80211_hw *hw,
                                iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0);
                                iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4);
 
-                               MACvSelectPage0(priv->port_offset);
+                               VT6655_MAC_SELECT_PAGE0(priv->port_offset);
                        } else {
                                MACvSelectPage1(priv->port_offset);
 
@@ -1601,7 +1601,7 @@ static void vnt_configure(struct ieee80211_hw *hw,
                                iowrite32((u32)(multicast >> 32),
                                          priv->port_offset + MAC_REG_MAR0 + 4);
 
-                               MACvSelectPage0(priv->port_offset);
+                               VT6655_MAC_SELECT_PAGE0(priv->port_offset);
                        }
 
                        spin_unlock_irqrestore(&priv->lock, flags);

diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index dcc649532737d8b390750645597e12324b25bee5..8485cd0a81c05c33021c032bfd2f85e73dce777d 100644 (file)
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -219,7 +219,7 @@ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf)
        memcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base,
                      MAC_MAX_CONTEXT_SIZE_PAGE1);
 
-       MACvSelectPage0(io_base);
+       VT6655_MAC_SELECT_PAGE0(io_base);
 }
 
 /*
@@ -245,7 +245,7 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf)
        memcpy_toio(io_base, cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0,
                    MAC_MAX_CONTEXT_SIZE_PAGE1);
 
-       MACvSelectPage0(io_base);
+       VT6655_MAC_SELECT_PAGE0(io_base);
 
        /* restore RCR,TCR,IMR... */
        memcpy_toio(io_base + MAC_REG_RCR, cxt_buf + MAC_REG_RCR,

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index b6c4f2bb096a1d34af1eae95a5df59dadccfedd9..a14b38a96ec62903cf42b6a1ba880436afb5c11a 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -537,8 +537,7 @@
 
 /*---------------------  Export Macros ------------------------------*/
 
-#define MACvSelectPage0(iobase)                                \
-       iowrite8(0, iobase + MAC_REG_PAGE1SEL)
+#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, iobase + MAC_REG_PAGE1SEL)
 
 #define MACvSelectPage1(iobase)                                \
        iowrite8(1, iobase + MAC_REG_PAGE1SEL)