staging: vt6655: fix camelcase in byLocalID

Replace camel case variable name for variable byLocalID
with snake case equivalent.

Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com>
Link: https://lore.kernel.org/r/20211010220014.148785-1-tomm.merciai@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index d6e114f256850c4b9ce9f89e21a30f3c1cb9a5ac..0bae35af6e0fe085a362d65ae62201b0f14df6e3 100644 (file)
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1994,7 +1994,7 @@ bool bb_vt3253_init(struct vnt_private *priv)
        int        ii;
        void __iomem *iobase = priv->port_offset;
        unsigned char by_rf_type = priv->byRFType;
-       unsigned char by_local_id = priv->byLocalID;
+       unsigned char by_local_id = priv->local_id;
 
        if (by_rf_type == RF_RFMD2959) {
                if (by_local_id <= REV_ID_VT3253_A1) {

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index b5e6880555fd3e9f158d09c43f9abac983145ade..834b9db05dff90814703cbcef1e1057ddd3d4f00 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -427,7 +427,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv)
 
        MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_RXON);
 
-       bb_set_deep_sleep(priv, priv->byLocalID);
+       bb_set_deep_sleep(priv, priv->local_id);
 
        priv->bRadioOff = true;
        pr_debug("chester power off\n");

diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c
index 76ee3146b8658a18873e19150130bef6558241b0..b550a1a0844e51d75ea6e1ae40de2e8e680027eb 100644 (file)
--- a/drivers/staging/vt6655/channel.c
+++ b/drivers/staging/vt6655/channel.c
@@ -193,7 +193,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
 
        bb_software_reset(priv);
 
-       if (priv->byLocalID > REV_ID_VT3253_B1) {
+       if (priv->local_id > REV_ID_VT3253_B1) {
                unsigned long flags;
 
                spin_lock_irqsave(&priv->lock, flags);

diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index ea6f9568f112b390366120ddb9c165e703ffeed9..92d6f82f939f3d6f3200d0064f7c05bb4593a5c1 100644 (file)
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -154,7 +154,7 @@ struct vnt_private {
        u32                         rx_bytes;
 
        /* Version control */
-       unsigned char byLocalID;
+       unsigned char local_id;
        unsigned char byRFType;
 
        unsigned char byMaxPwrLevel;

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 3683a9d65017c737a81c8c1eac58b8f00db28e09..24f0e346da129e05384bf6862cae5206669ae86c 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -219,7 +219,7 @@ static void device_init_registers(struct vnt_private *priv)
        MACvInitialize(priv);
 
        /* Get Local ID */
-       VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->byLocalID);
+       VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->local_id);
 
        spin_lock_irqsave(&priv->lock, flags);
 
@@ -331,7 +331,7 @@ static void device_init_registers(struct vnt_private *priv)
                                           (unsigned char)(ii + EEP_OFS_OFDMA_PWR_dBm));
        }
 
-       if (priv->byLocalID > REV_ID_VT3253_B1) {
+       if (priv->local_id > REV_ID_VT3253_B1) {
                MACvSelectPage1(priv->port_offset);
 
                VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1,
@@ -398,7 +398,7 @@ static void device_init_registers(struct vnt_private *priv)
        /* reset Rx pointer */
        CARDvSafeResetTx(priv);
 
-       if (priv->byLocalID <= REV_ID_VT3253_A1)
+       if (priv->local_id <= REV_ID_VT3253_A1)
                MACvRegBitsOn(priv->port_offset, MAC_REG_RCR, RCR_WPAERR);
 
        /* Turn On Rx DMA */

diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index 2d06cecc03075d3139a45f18e0b088e81f74e0cc..a7d1d35de5d46f23c6a0efcff43fd73cb607be5f 100644 (file)
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -100,7 +100,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb,
        rx_status.rate_idx = rate_idx;
 
        if (ieee80211_has_protected(fc)) {
-               if (priv->byLocalID > REV_ID_VT3253_A1)
+               if (priv->local_id > REV_ID_VT3253_A1)
                        rx_status.flag |= RX_FLAG_DECRYPTED;
 
                /* Drop packet */

diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index 20881cf2f394a66da8d12c04ac3c5be6a13d8792..f843966a3ea46b5dcea6d38d0137cfb1a7c0e118 100644 (file)
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -81,7 +81,7 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
        }
 
        MACvSetKeyEntry(priv, key_mode, entry, key_inx,
-                       bssid, (u32 *)key->key, priv->byLocalID);
+                       bssid, (u32 *)key->key, priv->local_id);
 
        return 0;
 }

diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 1ae7148b409272ab137bda7fbeac5bf3f03aa4c9..80cced7dfda810160716ff1fcaeff5373257dd0d 100644 (file)
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -763,14 +763,14 @@ bool MACbPSWakeup(struct vnt_private *priv)
 void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
                     unsigned int uEntryIdx, unsigned int uKeyIdx,
                     unsigned char *pbyAddr, u32 *pdwKey,
-                    unsigned char byLocalID)
+                    unsigned char local_id)
 {
        void __iomem *io_base = priv->port_offset;
        unsigned short offset;
        u32 data;
        int     ii;
 
-       if (byLocalID <= 1)
+       if (local_id <= 1)
                return;
 
        offset = MISCFIFO_KEYETRY0;

diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 3043d2813074bbf9f9b7e6bf82b16027f4e43925..550dc4da80a95c109714f1d974a3b517af66627e 100644 (file)
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -921,7 +921,7 @@ bool MACbPSWakeup(struct vnt_private *priv);
 void MACvSetKeyEntry(struct vnt_private *priv, unsigned short wKeyCtl,
                     unsigned int uEntryIdx, unsigned int uKeyIdx,
                     unsigned char *pbyAddr, u32 *pdwKey,
-                    unsigned char byLocalID);
+                    unsigned char local_id);
 void MACvDisableKeyEntry(struct vnt_private *priv, unsigned int uEntryIdx);
 
 #endif /* __MAC_H__ */

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 7ec7fd30932927a110ac6caaca1766aab4ea7dd9..ff0b5391ea0b0314d1dee7feae3c5ada58591737 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1012,7 +1012,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
 
                cbFrameSize += info->control.hw_key->icv_len;
 
-               if (pDevice->byLocalID > REV_ID_VT3253_A1) {
+               if (pDevice->local_id > REV_ID_VT3253_A1) {
                        /* MAC Header should be padding 0 to DW alignment. */
                        uPadding = 4 - (ieee80211_get_hdrlen_from_skb(skb) % 4);
                        uPadding %= 4;