Make the variable names adhere to Linux kernel coding style and fix
checkpatch.pl errors.
Gilbert Adikankwu (5):
staging: vt6655: Rename variable byCWMaxMin
staging: vt6655: Rename variable bySlot
staging: vt6655: Rename variable bySIFS
staging: vt6655: Rename variable byDIFS
staging: vt6655: Rename variable byEIFS
drivers/staging/vt6655/card.c | 72 ++++++++++++++++-----------------
drivers/staging/vt6655/device.h | 10 ++---
2 files changed, 41 insertions(+), 41 deletions(-)
--
2.34.1
Remove byte Type encoding "by" from variable name and replace camelcase
with snakecase
Fix checkpatch.pl error:
CHECK: Avoid CamelCase: <byDIFS>
Signed-off-by: Gilbert Adikankwu <[email protected]>
---
drivers/staging/vt6655/card.c | 18 +++++++++---------
drivers/staging/vt6655/device.h | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 48e571badfb1..9c8648ea96be 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -187,7 +187,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
unsigned char cw_max_min = 0;
unsigned char slot = 0;
unsigned char sifs = 0;
- unsigned char byDIFS = 0;
+ unsigned char difs = 0;
int i;
/* Set SIFS, DIFS, EIFS, SlotTime, CwMin */
@@ -196,14 +196,14 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
bb_write_embedded(priv, 0x88, 0x03);
slot = C_SLOT_SHORT;
sifs = C_SIFS_A;
- byDIFS = C_SIFS_A + 2 * C_SLOT_SHORT;
+ difs = 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;
sifs = C_SIFS_BG;
- byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
+ difs = 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);
@@ -212,10 +212,10 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
if (priv->short_slot_time) {
slot = C_SLOT_SHORT;
- byDIFS = C_SIFS_BG + 2 * C_SLOT_SHORT;
+ difs = C_SIFS_BG + 2 * C_SLOT_SHORT;
} else {
slot = C_SLOT_LONG;
- byDIFS = C_SIFS_BG + 2 * C_SLOT_LONG;
+ difs = C_SIFS_BG + 2 * C_SLOT_LONG;
}
cw_max_min = 0xa4;
@@ -234,7 +234,7 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
* time here is 2 us.
*/
sifs -= 3;
- byDIFS -= 3;
+ difs -= 3;
/*
* TX_PE will reserve 3 us for MAX2829 A mode only, it is for
* better TX throughput; MAC will need 2 us to process, so the
@@ -246,9 +246,9 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
priv->sifs = sifs;
iowrite8(priv->sifs, priv->port_offset + MAC_REG_SIFS);
}
- if (priv->byDIFS != byDIFS) {
- priv->byDIFS = byDIFS;
- iowrite8(priv->byDIFS, priv->port_offset + MAC_REG_DIFS);
+ if (priv->difs != difs) {
+ priv->difs = difs;
+ iowrite8(priv->difs, priv->port_offset + MAC_REG_DIFS);
}
if (priv->byEIFS != C_EIFS) {
priv->byEIFS = C_EIFS;
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index e6669c5f0b8b..264bb056c80c 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -182,7 +182,7 @@ struct vnt_private {
unsigned int uCwMax; /* CwMax is fixed on 1023. */
/* PHY parameter */
unsigned char sifs;
- unsigned char byDIFS;
+ unsigned char difs;
unsigned char byEIFS;
unsigned char slot;
unsigned char cw_max_min;
--
2.34.1
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 <[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 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;
--
2.34.1
Remove byte Type encoding "by" from variable name and replace camelcase
with snakecase.
Fix checkpatch.pl error:
CHECK: Avoid CamelCase: <byEIFS>
Signed-off-by: Gilbert Adikankwu <[email protected]>
---
drivers/staging/vt6655/card.c | 6 +++---
drivers/staging/vt6655/device.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 9c8648ea96be..079fd01c6780 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -250,9 +250,9 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type)
priv->difs = difs;
iowrite8(priv->difs, priv->port_offset + MAC_REG_DIFS);
}
- if (priv->byEIFS != C_EIFS) {
- priv->byEIFS = C_EIFS;
- iowrite8(priv->byEIFS, priv->port_offset + MAC_REG_EIFS);
+ if (priv->eifs != C_EIFS) {
+ priv->eifs = C_EIFS;
+ iowrite8(priv->eifs, priv->port_offset + MAC_REG_EIFS);
}
if (priv->slot != slot) {
priv->slot = slot;
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 264bb056c80c..7773b19a5788 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -183,7 +183,7 @@ struct vnt_private {
/* PHY parameter */
unsigned char sifs;
unsigned char difs;
- unsigned char byEIFS;
+ unsigned char eifs;
unsigned char slot;
unsigned char cw_max_min;
--
2.34.1
On 10/22/23 01:12, Gilbert Adikankwu wrote:
> Make the variable names adhere to Linux kernel coding style and fix
> checkpatch.pl errors.
>
> Gilbert Adikankwu (5):
> staging: vt6655: Rename variable byCWMaxMin
> staging: vt6655: Rename variable bySlot
> staging: vt6655: Rename variable bySIFS
> staging: vt6655: Rename variable byDIFS
> staging: vt6655: Rename variable byEIFS
>
> drivers/staging/vt6655/card.c | 72 ++++++++++++++++-----------------
> drivers/staging/vt6655/device.h | 10 ++---
> 2 files changed, 41 insertions(+), 41 deletions(-)
>
Tested-by: Philipp Hortmann <[email protected]>