staging: vt6655: Rename variable bySlot
authorGilbert Adikankwu <gilbertadikankwu@gmail.com>
Sat, 21 Oct 2023 23:12:28 +0000 (00:12 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Oct 2023 10:23:31 +0000 (12:23 +0200)
Remove byte Type encoding "by" from variable name and replace camelcase
with snakecase.

Fix checkpatch.pl error:
CHECK: Avoid CamelCase: <bySlot>

Signed-off-by: Gilbert Adikankwu <gilbertadikankwu@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/57a1a08fba23d8da8ed1411d84f31f074f510444.1697927812.git.gilbertadikankwu@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/card.c
drivers/staging/vt6655/device.h

index 08e50311f7ba8598cf0b331dde37f893952d1076..b5a87837995f100af66e0c877e3673d38155903b 100644 (file)
@@ -185,7 +185,7 @@ static void s_vCalculateOFDMRParameter(unsigned char rate,
 bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
 {
        unsigned char cw_max_min = 0;
-       unsigned char bySlot = 0;
+       unsigned char slot = 0;
        unsigned char bySIFS = 0;
        unsigned char byDIFS = 0;
        int i;
@@ -194,14 +194,14 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
        if (bb_type == BB_TYPE_11A) {
                vt6655_mac_set_bb_type(priv->port_offset, BB_TYPE_11A);
                bb_write_embedded(priv, 0x88, 0x03);
-               bySlot = C_SLOT_SHORT;
+               slot = C_SLOT_SHORT;
                bySIFS = C_SIFS_A;
                byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT;
                cw_max_min = 0xA4;
        } else if (bb_type == BB_TYPE_11B) {
                vt6655_mac_set_bb_type(priv->port_offset, BB_TYPE_11B);
                bb_write_embedded(priv, 0x88, 0x02);
-               bySlot = C_SLOT_LONG;
+               slot = C_SLOT_LONG;
                bySIFS = C_SIFS_BG;
                byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
                cw_max_min = 0xA5;
@@ -211,10 +211,10 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
                bySIFS = C_SIFS_BG;
 
                if (priv->short_slot_time) {
-                       bySlot = C_SLOT_SHORT;
+                       slot = C_SLOT_SHORT;
                        byDIFS = C_SIFS_BG + 2 * C_SLOT_SHORT;
                } else {
-                       bySlot = C_SLOT_LONG;
+                       slot = C_SLOT_LONG;
                        byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
                }
 
@@ -254,9 +254,9 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
                priv->byEIFS = C_EIFS;
                iowrite8(priv->byEIFS, priv->port_offset + MAC_REG_EIFS);
        }
-       if (priv->bySlot != bySlot) {
-               priv->bySlot = bySlot;
-               iowrite8(priv->bySlot, priv->port_offset + MAC_REG_SLOT);
+       if (priv->slot != slot) {
+               priv->slot = slot;
+               iowrite8(priv->slot, priv->port_offset + MAC_REG_SLOT);
 
                bb_set_short_slot_time(priv);
        }
index 8ff28e4e72a4511be410295753ef9bcbfe3d1ea2..a63a8ddb7ff1516d439e5cdee0778906615e583e 100644 (file)
@@ -184,7 +184,7 @@ struct vnt_private {
        unsigned char bySIFS;
        unsigned char byDIFS;
        unsigned char byEIFS;
-       unsigned char bySlot;
+       unsigned char slot;
        unsigned char cw_max_min;
 
        u8              byBBType; /* 0:11A, 1:11B, 2:11G */