Remove byte Type encoding "by" from variable name and replace camelcase
with snakecase
Fix checkpatch.pl error:
CHECK: Avoid CamelCase: <byCWMaxMin>
Signed-off-by: Gilbert Adikankwu <[email protected]>
---
drivers/staging/vt6655/card.c | 16 ++++++++--------
drivers/staging/vt6655/device.h | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index bec39c72d540..08e50311f7ba 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -184,7 +184,7 @@ static void s_vCalculateOFDMRParameter(unsigned char rate,
*/
bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
{
- unsigned char byCWMaxMin = 0;
+ unsigned char cw_max_min = 0;
unsigned char bySlot = 0;
unsigned char bySIFS = 0;
unsigned char byDIFS = 0;
@@ -197,14 +197,14 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
bySlot = C_SLOT_SHORT;
bySIFS = C_SIFS_A;
byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT;
- byCWMaxMin = 0xA4;
+ 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;
bySIFS = C_SIFS_BG;
byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
- byCWMaxMin = 0xA5;
+ 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);
@@ -218,11 +218,11 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
}
- byCWMaxMin = 0xa4;
+ cw_max_min = 0xa4;
for (i = RATE_54M; i >= RATE_6M; i--) {
if (priv->basic_rates & ((u32)(0x1 << i))) {
- byCWMaxMin |= 0x1;
+ cw_max_min |= 0x1;
break;
}
}
@@ -260,9 +260,9 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
bb_set_short_slot_time(priv);
}
- if (priv->byCWMaxMin != byCWMaxMin) {
- priv->byCWMaxMin = byCWMaxMin;
- iowrite8(priv->byCWMaxMin, priv->port_offset + MAC_REG_CWMAXMIN0);
+ if (priv->cw_max_min != cw_max_min) {
+ priv->cw_max_min = cw_max_min;
+ iowrite8(priv->cw_max_min, priv->port_offset + MAC_REG_CWMAXMIN0);
}
priv->byPacketType = CARDbyGetPktType(priv);
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 2b5f9bf6aa5d..8ff28e4e72a4 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -185,7 +185,7 @@ struct vnt_private {
unsigned char byDIFS;
unsigned char byEIFS;
unsigned char bySlot;
- unsigned char byCWMaxMin;
+ unsigned char cw_max_min;
u8 byBBType; /* 0:11A, 1:11B, 2:11G */
u8 byPacketType; /*
--
2.34.1