staging: vt6655: Rename variable bySIFS
authorGilbert Adikankwu <gilbertadikankwu@gmail.com>
Sat, 21 Oct 2023 23:12:29 +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: <bySIFS>

Signed-off-by: Gilbert Adikankwu <gilbertadikankwu@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/f75f308f187fa9a9e14bf25db006131e2dcda43b.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 b5a87837995f100af66e0c877e3673d38155903b..48e571badfb194eb520007a0d2ca8e4e26f2dd97 100644 (file)
@@ -186,7 +186,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
 {
        unsigned char cw_max_min = 0;
        unsigned char slot = 0;
-       unsigned char bySIFS = 0;
+       unsigned char sifs = 0;
        unsigned char byDIFS = 0;
        int i;
 
@@ -195,20 +195,20 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
                vt6655_mac_set_bb_type(priv->port_offset, BB_TYPE_11A);
                bb_write_embedded(priv, 0x88, 0x03);
                slot = C_SLOT_SHORT;
-               bySIFS = C_SIFS_A;
+               sifs = 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);
                slot = C_SLOT_LONG;
-               bySIFS = C_SIFS_BG;
+               sifs = C_SIFS_BG;
                byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
                cw_max_min = 0xA5;
        } else { /* PK_TYPE_11GA & PK_TYPE_11GB */
                vt6655_mac_set_bb_type(priv->port_offset, BB_TYPE_11G);
                bb_write_embedded(priv, 0x88, 0x08);
-               bySIFS = C_SIFS_BG;
+               sifs = C_SIFS_BG;
 
                if (priv->short_slot_time) {
                        slot = C_SLOT_SHORT;
@@ -233,7 +233,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
                 * bcs TX_PE will reserve 3 us hardware's processing
                 * time here is 2 us.
                 */
-               bySIFS -= 3;
+               sifs -= 3;
                byDIFS -= 3;
                /*
                 * TX_PE will reserve 3 us for MAX2829 A mode only, it is for
@@ -242,9 +242,9 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
                 */
        }
 
-       if (priv->bySIFS != bySIFS) {
-               priv->bySIFS = bySIFS;
-               iowrite8(priv->bySIFS, priv->port_offset + MAC_REG_SIFS);
+       if (priv->sifs != sifs) {
+               priv->sifs = sifs;
+               iowrite8(priv->sifs, priv->port_offset + MAC_REG_SIFS);
        }
        if (priv->byDIFS != byDIFS) {
                priv->byDIFS = byDIFS;
index a63a8ddb7ff1516d439e5cdee0778906615e583e..e6669c5f0b8b214ecf50378ea1e5106c286a3d16 100644 (file)
@@ -181,7 +181,7 @@ struct vnt_private {
        unsigned int    uCwMin;   /* Current CwMin */
        unsigned int    uCwMax;   /* CwMax is fixed on 1023. */
        /* PHY parameter */
-       unsigned char bySIFS;
+       unsigned char sifs;
        unsigned char byDIFS;
        unsigned char byEIFS;
        unsigned char slot;