* [PATCH v2 1/3] staging: rtl8192e: renamed variable nMcsRate
2023-11-28 14:20 [PATCH v2 0/3] staging: rtl8192e: patch series renames (3) different variables Gary Rookard
@ 2023-11-28 14:20 ` Gary Rookard
2023-11-28 14:30 ` Dan Carpenter
2023-11-28 14:38 ` Dan Carpenter
2023-11-28 14:20 ` [PATCH v2 2/3] staging: rtl8192e: renamed variable bCurBW40MHz Gary Rookard
2023-11-28 14:20 ` [PATCH v2 3/3] staging: rtl8192e: renamed variable nDataRate Gary Rookard
2 siblings, 2 replies; 6+ messages in thread
From: Gary Rookard @ 2023-11-28 14:20 UTC (permalink / raw)
To: gregkh, philipp.g.hortmann; +Cc: linux-staging, linux-kernel, Gary Rookard
v2: Renamed from CamelCase to Snake case the variable nMcsRate, and
additionally removed the Hungarian notation of (n) that [v1] did not.
nMcsRate -> mcs_rate
Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8192e compiles.
Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
v2: Removes Hungarian notation.
v1: Renames from CamelCase only, Hungarian notation unremoved.
drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 00273d709f3c..4ed72936eb4a 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -103,7 +103,7 @@ void ht_update_default_setting(struct rtllib_device *ieee)
ht_info->rx_reorder_pending_time = 30;
}
-static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 nMcsRate)
+static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate)
{
struct rt_hi_throughput *ht_info = ieee->ht_info;
@@ -111,7 +111,7 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 nMcsRate)
u8 isShortGI = (ht_info->bCurBW40MHz) ?
((ht_info->bCurShortGI40MHz) ? 1 : 0) :
((ht_info->bCurShortGI20MHz) ? 1 : 0);
- return MCS_DATA_RATE[is40MHz][isShortGI][(nMcsRate & 0x7f)];
+ return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)];
}
u16 tx_count_to_data_rate(struct rtllib_device *ieee, u8 nDataRate)
--
2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/3] staging: rtl8192e: renamed variable nMcsRate
2023-11-28 14:20 ` [PATCH v2 1/3] staging: rtl8192e: renamed variable nMcsRate Gary Rookard
@ 2023-11-28 14:30 ` Dan Carpenter
2023-11-28 14:38 ` Dan Carpenter
1 sibling, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2023-11-28 14:30 UTC (permalink / raw)
To: Gary Rookard; +Cc: gregkh, philipp.g.hortmann, linux-staging, linux-kernel
On Tue, Nov 28, 2023 at 09:20:25AM -0500, Gary Rookard wrote:
> v2: Renamed from CamelCase to Snake case the variable nMcsRate, and
^^^^
> additionally removed the Hungarian notation of (n) that [v1] did not.
^^^
Delete this stuff. We are not going to merge v1 so we don't want to
mention it in the permanent git log.
> nMcsRate -> mcs_rate
>
> Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
> Driver/module rtl8192e compiles.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This is taken as a given. Don't put this in the commit message.
>
> Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
This commit message is kind of bad. A better commit message would be:
"Checkpatch complains about the "nMcsRate" variable because it is
CamelCase. Rename it to "mcs_rate"".
There are a bunch of ways you could write the commit message but my
proposal is acceptable. If you want to mention Hungarian notation you
can. "Plus it's Hungarian notation and Hungarian notation is rubbish."
but that's not necessary. If you're going to rename the variable then
we just consider that you're going to look at the context and the
surrounding code and pick a good consistent variable.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/3] staging: rtl8192e: renamed variable nMcsRate
2023-11-28 14:20 ` [PATCH v2 1/3] staging: rtl8192e: renamed variable nMcsRate Gary Rookard
2023-11-28 14:30 ` Dan Carpenter
@ 2023-11-28 14:38 ` Dan Carpenter
1 sibling, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2023-11-28 14:38 UTC (permalink / raw)
To: Gary Rookard; +Cc: gregkh, philipp.g.hortmann, linux-staging, linux-kernel
On Tue, Nov 28, 2023 at 09:20:25AM -0500, Gary Rookard wrote:
> v2: Renamed from CamelCase to Snake case the variable nMcsRate, and
> additionally removed the Hungarian notation of (n) that [v1] did not.
> nMcsRate -> mcs_rate
>
> Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
> Driver/module rtl8192e compiles.
>
> Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
> ---
> v2: Removes Hungarian notation.
> v1: Renames from CamelCase only, Hungarian notation unremoved.
>
> drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
> index 00273d709f3c..4ed72936eb4a 100644
> --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
> +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
> @@ -103,7 +103,7 @@ void ht_update_default_setting(struct rtllib_device *ieee)
> ht_info->rx_reorder_pending_time = 30;
> }
>
> -static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 nMcsRate)
> +static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate)
In the caller, this variable is called mcsRate, which presumably
checkpatch also complains about. Why not rename them both to the same
thing?
It's unclear what value adding the "mcs_" prefix has, but I guess it's
nice to have a consistent variable name to grep for.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] staging: rtl8192e: renamed variable bCurBW40MHz
2023-11-28 14:20 [PATCH v2 0/3] staging: rtl8192e: patch series renames (3) different variables Gary Rookard
2023-11-28 14:20 ` [PATCH v2 1/3] staging: rtl8192e: renamed variable nMcsRate Gary Rookard
@ 2023-11-28 14:20 ` Gary Rookard
2023-11-28 14:20 ` [PATCH v2 3/3] staging: rtl8192e: renamed variable nDataRate Gary Rookard
2 siblings, 0 replies; 6+ messages in thread
From: Gary Rookard @ 2023-11-28 14:20 UTC (permalink / raw)
To: gregkh, philipp.g.hortmann; +Cc: linux-staging, linux-kernel, Gary Rookard
v2: Renamed from CamelCase to Snake case the variable bCurBW40MHz,
and addionally removed the Hungarian notation (n) that [v1] did not.
bCurBW40MHz -> cur_bw_40mhz
Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8192e compiles.
Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
v2: Removes Hungarian notation.
v1: Renamed from CamelCase only, Hungarian notation unremoved.
drivers/staging/rtl8192e/rtl819x_HT.h | 2 +-
drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 ++--
drivers/staging/rtl8192e/rtllib_tx.c | 10 +++++-----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h
index a4fe72943b36..dd86faab6f53 100644
--- a/drivers/staging/rtl8192e/rtl819x_HT.h
+++ b/drivers/staging/rtl8192e/rtl819x_HT.h
@@ -95,7 +95,7 @@ struct rt_hi_throughput {
u8 enable_ht;
u8 current_ht_support;
u8 bRegBW40MHz;
- u8 bCurBW40MHz;
+ u8 cur_bw_40mhz;
u8 bRegShortGI40MHz;
u8 bCurShortGI40MHz;
u8 bRegShortGI20MHz;
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 4ed72936eb4a..87e96f2abed0 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -107,8 +107,8 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate)
{
struct rt_hi_throughput *ht_info = ieee->ht_info;
- u8 is40MHz = (ht_info->bCurBW40MHz) ? 1 : 0;
- u8 isShortGI = (ht_info->bCurBW40MHz) ?
+ u8 is40MHz = (ht_info->cur_bw_40mhz) ? 1 : 0;
+ u8 isShortGI = (ht_info->cur_bw_40mhz) ?
((ht_info->bCurShortGI40MHz) ? 1 : 0) :
((ht_info->bCurShortGI20MHz) ? 1 : 0);
return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)];
@@ -559,7 +559,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
ht_info->current_ht_support = false;
- ht_info->bCurBW40MHz = false;
+ ht_info->cur_bw_40mhz = false;
ht_info->cur_tx_bw40mhz = false;
ht_info->bCurShortGI20MHz = false;
@@ -705,7 +705,7 @@ static void HTSetConnectBwModeCallback(struct rtllib_device *ieee)
{
struct rt_hi_throughput *ht_info = ieee->ht_info;
- if (ht_info->bCurBW40MHz) {
+ if (ht_info->cur_bw_40mhz) {
if (ht_info->CurSTAExtChnlOffset == HT_EXTCHNL_OFFSET_UPPER)
ieee->set_chan(ieee->dev,
ieee->current_network.channel + 2);
@@ -750,19 +750,19 @@ void HTSetConnectBwMode(struct rtllib_device *ieee,
Offset = HT_EXTCHNL_OFFSET_NO_EXT;
if (Offset == HT_EXTCHNL_OFFSET_UPPER ||
Offset == HT_EXTCHNL_OFFSET_LOWER) {
- ht_info->bCurBW40MHz = true;
+ ht_info->cur_bw_40mhz = true;
ht_info->CurSTAExtChnlOffset = Offset;
} else {
- ht_info->bCurBW40MHz = false;
+ ht_info->cur_bw_40mhz = false;
ht_info->CurSTAExtChnlOffset = HT_EXTCHNL_OFFSET_NO_EXT;
}
} else {
- ht_info->bCurBW40MHz = false;
+ ht_info->cur_bw_40mhz = false;
ht_info->CurSTAExtChnlOffset = HT_EXTCHNL_OFFSET_NO_EXT;
}
netdev_dbg(ieee->dev, "%s():ht_info->bCurBW40MHz:%x\n", __func__,
- ht_info->bCurBW40MHz);
+ ht_info->cur_bw_40mhz);
ht_info->sw_bw_in_progress = true;
diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 28aba1d610f7..b48c89d2e7bf 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -318,10 +318,10 @@ void rtllib_wx_sync_scan_wq(void *data)
ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP);
if (ieee->ht_info->current_ht_support && ieee->ht_info->enable_ht &&
- ieee->ht_info->bCurBW40MHz) {
+ ieee->ht_info->cur_bw_40mhz) {
b40M = 1;
chan_offset = ieee->ht_info->CurSTAExtChnlOffset;
- bandwidth = (enum ht_channel_width)ieee->ht_info->bCurBW40MHz;
+ bandwidth = (enum ht_channel_width)ieee->ht_info->cur_bw_40mhz;
ieee->set_bw_mode_handler(ieee->dev, HT_CHANNEL_WIDTH_20,
HT_EXTCHNL_OFFSET_NO_EXT);
}
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 1da098f5b84c..a79f9d8c9162 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -362,9 +362,9 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee,
return;
}
- if (ht_info->bCurBW40MHz && ht_info->bCurShortGI40MHz)
+ if (ht_info->cur_bw_40mhz && ht_info->bCurShortGI40MHz)
tcb_desc->bUseShortGI = true;
- else if (!ht_info->bCurBW40MHz && ht_info->bCurShortGI20MHz)
+ else if (!ht_info->cur_bw_40mhz && ht_info->bCurShortGI20MHz)
tcb_desc->bUseShortGI = true;
}
@@ -383,7 +383,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_device *ieee,
if ((tcb_desc->data_rate & 0x80) == 0)
return;
- if (ht_info->bCurBW40MHz && ht_info->cur_tx_bw40mhz &&
+ if (ht_info->cur_bw_40mhz && ht_info->cur_tx_bw40mhz &&
!ieee->bandwidth_auto_switch.bforced_tx20Mhz)
tcb_desc->bPacketBW = true;
}
@@ -441,9 +441,9 @@ static void rtllib_query_protectionmode(struct rtllib_device *ieee,
if (ht_info->current_ht_support && ht_info->enable_ht) {
u8 HTOpMode = ht_info->current_op_mode;
- if ((ht_info->bCurBW40MHz && (HTOpMode == 2 ||
+ if ((ht_info->cur_bw_40mhz && (HTOpMode == 2 ||
HTOpMode == 3)) ||
- (!ht_info->bCurBW40MHz && HTOpMode == 3)) {
+ (!ht_info->cur_bw_40mhz && HTOpMode == 3)) {
tcb_desc->rts_rate = MGN_24M;
tcb_desc->bRTSEnable = true;
break;
--
2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 3/3] staging: rtl8192e: renamed variable nDataRate
2023-11-28 14:20 [PATCH v2 0/3] staging: rtl8192e: patch series renames (3) different variables Gary Rookard
2023-11-28 14:20 ` [PATCH v2 1/3] staging: rtl8192e: renamed variable nMcsRate Gary Rookard
2023-11-28 14:20 ` [PATCH v2 2/3] staging: rtl8192e: renamed variable bCurBW40MHz Gary Rookard
@ 2023-11-28 14:20 ` Gary Rookard
2 siblings, 0 replies; 6+ messages in thread
From: Gary Rookard @ 2023-11-28 14:20 UTC (permalink / raw)
To: gregkh, philipp.g.hortmann; +Cc: linux-staging, linux-kernel, Gary Rookard
v2: Renamed from CamelCase to Snake case the variable nDataRate,
and additionally removed the Hungarian notation (n) that [v1] did not.
nDataRate -> data_rate
Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8192e compiles.
Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
v2: Removes Hungarian notation.
v1: Renames from CamelCase only, Hungarian notation unremoved.
drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 87e96f2abed0..f263f329db77 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -114,29 +114,29 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate)
return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)];
}
-u16 tx_count_to_data_rate(struct rtllib_device *ieee, u8 nDataRate)
+u16 tx_count_to_data_rate(struct rtllib_device *ieee, u8 data_rate)
{
u16 CCKOFDMRate[12] = {0x02, 0x04, 0x0b, 0x16, 0x0c, 0x12, 0x18,
0x24, 0x30, 0x48, 0x60, 0x6c};
u8 is40MHz = 0;
u8 isShortGI = 0;
- if (nDataRate < 12)
- return CCKOFDMRate[nDataRate];
- if (nDataRate >= 0x10 && nDataRate <= 0x1f) {
+ if (data_rate < 12)
+ return CCKOFDMRate[data_rate];
+ if (data_rate >= 0x10 && data_rate <= 0x1f) {
is40MHz = 0;
isShortGI = 0;
- } else if (nDataRate >= 0x20 && nDataRate <= 0x2f) {
+ } else if (data_rate >= 0x20 && data_rate <= 0x2f) {
is40MHz = 1;
isShortGI = 0;
- } else if (nDataRate >= 0x30 && nDataRate <= 0x3f) {
+ } else if (data_rate >= 0x30 && data_rate <= 0x3f) {
is40MHz = 0;
isShortGI = 1;
- } else if (nDataRate >= 0x40 && nDataRate <= 0x4f) {
+ } else if (data_rate >= 0x40 && data_rate <= 0x4f) {
is40MHz = 1;
isShortGI = 1;
}
- return MCS_DATA_RATE[is40MHz][isShortGI][nDataRate & 0xf];
+ return MCS_DATA_RATE[is40MHz][isShortGI][data_rate & 0xf];
}
bool is_ht_half_nmode_aps(struct rtllib_device *ieee)
--
2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread