From: Gilbert Adikankwu <gilbertadikankwu@gmail.com>
To: gregkh@linuxfoundation.org, outreachy@lists.linux.dev
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Gilbert Adikankwu <gilbertadikankwu@gmail.com>
Subject: [PATCH 4/5] staging: vt6655: Rename variable byDIFS
Date: Sun, 22 Oct 2023 00:12:30 +0100 [thread overview]
Message-ID: <f10775da0decdbbec33d38236cdf89bcd8ab591e.1697927812.git.gilbertadikankwu@gmail.com> (raw)
In-Reply-To: <cover.1697927812.git.gilbertadikankwu@gmail.com>
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 <gilbertadikankwu@gmail.com>
---
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
next prev parent reply other threads:[~2023-10-21 23:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-21 23:12 [PATCH 0/5] staging: vt6655: Rename variables byCWMaxMin, bySlot, bySIFS, byDIFS and byEIFS Gilbert Adikankwu
2023-10-21 23:12 ` [PATCH 1/5] staging: vt6655: Rename variable byCWMaxMin Gilbert Adikankwu
2023-10-21 23:12 ` [PATCH 2/5] staging: vt6655: Rename variable bySlot Gilbert Adikankwu
2023-10-21 23:12 ` [PATCH 3/5] staging: vt6655: Rename variable bySIFS Gilbert Adikankwu
2023-10-21 23:12 ` Gilbert Adikankwu [this message]
2023-10-21 23:12 ` [PATCH 5/5] staging: vt6655: Rename variable byEIFS Gilbert Adikankwu
2023-10-22 7:09 ` [PATCH 0/5] staging: vt6655: Rename variables byCWMaxMin, bySlot, bySIFS, byDIFS and byEIFS Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f10775da0decdbbec33d38236cdf89bcd8ab591e.1697927812.git.gilbertadikankwu@gmail.com \
--to=gilbertadikankwu@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=outreachy@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox