diff options
| author | Gilbert Adikankwu <gilbertadikankwu@gmail.com> | 2023-10-22 00:12:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-22 12:23:31 +0200 |
| commit | 25b8c77ecdd39eb8afb4e3be001f6f7baf12acda (patch) | |
| tree | 47e07f6c82a6e48e8ab76f36ad3c210f5f5c7320 /drivers/staging/vt6655 | |
| parent | e63771781beadbdef537f6de36f62c8e672a5b8f (diff) | |
| download | linux-stable-25b8c77ecdd39eb8afb4e3be001f6f7baf12acda.tar.gz linux-stable-25b8c77ecdd39eb8afb4e3be001f6f7baf12acda.tar.bz2 linux-stable-25b8c77ecdd39eb8afb4e3be001f6f7baf12acda.zip | |
staging: vt6655: Rename variable byCWMaxMin
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 <gilbertadikankwu@gmail.com>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/ed8ff47e7ee3a03d8c8c3cc43b4773bb1eb01f16.1697927812.git.gilbertadikankwu@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/card.c | 16 | ||||
| -rw-r--r-- | 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; /* |