diff options
| author | Gilbert Adikankwu <gilbertadikankwu@gmail.com> | 2023-10-22 02:12:29 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-22 13:23:31 +0300 |
| commit | d988a485f5940e119d6de4f2b17ea0a1dfc7db4f (patch) | |
| tree | b28da715e3f67745ef6c512623c9e81f35a060b8 /drivers/staging/vt6655 | |
| parent | e59314b68cc7ab639bfe1bf658a619b4b8b3ce4e (diff) | |
| download | linux-d988a485f5940e119d6de4f2b17ea0a1dfc7db4f.tar.xz | |
staging: vt6655: Rename variable bySIFS
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>
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 b5a87837995f..48e571badfb1 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -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; diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index a63a8ddb7ff1..e6669c5f0b8b 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -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; |