[PATCH 0/5] staging: rtl8192e: patch series renaming (6) different variables.

[PATCH 0/5] staging: rtl8192e: patch series renaming (6) different variables.

[Gary Rookard]

Hi,

This patch series renames (6) different variables from
CamelCase to Snake case.

Patch 1/5) renamed 2 variables nMcsRate, mcsRate
Patch 2/5) renamed variable isShortGI
Patch 3/5) renamed variable bCurBW40MHz
Patch 4/5) renamed variable nDataRate
Patch 5/5) renamed variable is40MHz

Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8192e compiles.

Regards,
Gary


Gary Rookard (5):
  staging: rtl8192e: renamed 2 variables nMcsRate, mcsRate
  staging: rtl8192e: renamed variable isShortGI
  staging: rtl8192e: renamed variable bCurBW40MHz
  staging: rtl8192e: renamed variable nDataRate
  staging: rtl8192e: renamed variable is40MHz

 drivers/staging/rtl8192e/rtl819x_HT.h        |  2 +-
 drivers/staging/rtl8192e/rtl819x_HTProc.c    | 66 ++++++++++----------
 drivers/staging/rtl8192e/rtllib_softmac_wx.c |  4 +-
 drivers/staging/rtl8192e/rtllib_tx.c         | 10 +--
 4 files changed, 41 insertions(+), 41 deletions(-)

-- 
2.41.0

[PATCH 1/5] staging: rtl8192e: renamed 2 variables nMcsRate, mcsRate

[Gary Rookard]

Renamed 2 variables from CamelCase to Snake case nMcsRate
and mcsRate.
nMcsRate -> n_mcs_rate
mcs_Rate -> mcs_rate

Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8192e compiles.

Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
 drivers/staging/rtl8192e/rtl819x_HTProc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index f43249fd78d7..7e61ebd2bc25 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 n_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][(n_mcs_rate & 0x7f)];
 }
 
 u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 nDataRate)
@@ -398,7 +398,7 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,
 {
 	u8		i, j;
 	u8		bitMap;
-	u8		mcsRate = 0;
+	u8		mcs_rate = 0;
 	u8		availableMcsRate[16];
 
 	if (!pMCSRateSet || !pMCSFilter) {
@@ -423,14 +423,14 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,
 			for (j = 0; j < 8; j++) {
 				if ((bitMap % 2) != 0) {
 					if (ht_mcs_to_data_rate(ieee, (8 * i + j)) >
-					    ht_mcs_to_data_rate(ieee, mcsRate))
-						mcsRate = 8 * i + j;
+					    ht_mcs_to_data_rate(ieee, mcs_rate))
+						mcs_rate = 8 * i + j;
 				}
 				bitMap >>= 1;
 			}
 		}
 	}
-	return mcsRate | 0x80;
+	return mcs_rate | 0x80;
 }
 
 static u8 HTFilterMCSRate(struct rtllib_device *ieee, u8 *pSupportMCS,
-- 
2.41.0

Re: [PATCH 1/5] staging: rtl8192e: renamed 2 variables nMcsRate, mcsRate

[Greg KH]

On Sat, Nov 25, 2023 at 05:34:28PM -0500, Gary Rookard wrote:
> Renamed 2 variables from CamelCase to Snake case nMcsRate
> and mcsRate.
> nMcsRate -> n_mcs_rate

Please drop the "n".

thanks,

greg k-h

Re: [PATCH 1/5] staging: rtl8192e: renamed 2 variables nMcsRate, mcsRate

[Gary Rookard]

Greg KH <gregkh@linuxfoundation.org> writes:

> On Sat, Nov 25, 2023 at 05:34:28PM -0500, Gary Rookard wrote:
>> Renamed 2 variables from CamelCase to Snake case nMcsRate
>> and mcsRate.
>> nMcsRate -> n_mcs_rate
>
> Please drop the "n".
>
> thanks,
>
> greg k-h

Okay, will redo.

Regards,
Gary

[PATCH 2/5] staging: rtl8192e: renamed variable isShortGI

[Gary Rookard]

Renamed from CamelCase to Snake case the variable isShortGI
isShortGI -> is_short_gi

Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module compiles.

Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
 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 7e61ebd2bc25..f002d948a316 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -108,10 +108,10 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 n_mcs_rate)
 	struct rt_hi_throughput *ht_info = ieee->ht_info;
 
 	u8	is40MHz = (ht_info->bCurBW40MHz) ? 1 : 0;
-	u8	isShortGI = (ht_info->bCurBW40MHz) ?
+	u8	is_short_gi = (ht_info->bCurBW40MHz) ?
 			    ((ht_info->bCurShortGI40MHz) ? 1 : 0) :
 			    ((ht_info->bCurShortGI20MHz) ? 1 : 0);
-	return MCS_DATA_RATE[is40MHz][isShortGI][(n_mcs_rate & 0x7f)];
+	return MCS_DATA_RATE[is40MHz][is_short_gi][(n_mcs_rate & 0x7f)];
 }
 
 u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 nDataRate)
@@ -119,24 +119,24 @@ u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 nDataRate)
 	u16	CCKOFDMRate[12] = {0x02, 0x04, 0x0b, 0x16, 0x0c, 0x12, 0x18,
 				   0x24, 0x30, 0x48, 0x60, 0x6c};
 	u8	is40MHz = 0;
-	u8	isShortGI = 0;
+	u8	is_short_gi = 0;
 
 	if (nDataRate < 12)
 		return CCKOFDMRate[nDataRate];
 	if (nDataRate >= 0x10 && nDataRate <= 0x1f) {
 		is40MHz = 0;
-		isShortGI = 0;
+		is_short_gi = 0;
 	} else if (nDataRate >= 0x20  && nDataRate <= 0x2f) {
 		is40MHz = 1;
-		isShortGI = 0;
+		is_short_gi = 0;
 	} else if (nDataRate >= 0x30  && nDataRate <= 0x3f) {
 		is40MHz = 0;
-		isShortGI = 1;
+		is_short_gi = 1;
 	} else if (nDataRate >= 0x40  && nDataRate <= 0x4f) {
 		is40MHz = 1;
-		isShortGI = 1;
+		is_short_gi = 1;
 	}
-	return MCS_DATA_RATE[is40MHz][isShortGI][nDataRate & 0xf];
+	return MCS_DATA_RATE[is40MHz][is_short_gi][nDataRate & 0xf];
 }
 
 bool is_ht_half_nmode_aps(struct rtllib_device *ieee)
-- 
2.41.0

[PATCH 3/5] staging: rtl8192e: renamed variable bCurBW40MHz

[Gary Rookard]

Renamed from CamelCase to Snake case the variable bCurBW40MHz.
bCurBW40MHz -> b_cur_bw_40mhz

Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8192e compiles.

Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
 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 f8eb4d553fe0..e24b106ca700 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 b_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 f002d948a316..f4de5ad7d9d1 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 n_mcs_rate)
 {
 	struct rt_hi_throughput *ht_info = ieee->ht_info;
 
-	u8	is40MHz = (ht_info->bCurBW40MHz) ? 1 : 0;
-	u8	is_short_gi = (ht_info->bCurBW40MHz) ?
+	u8	is40MHz = (ht_info->b_cur_bw_40mhz) ? 1 : 0;
+	u8	is_short_gi = (ht_info->b_cur_bw_40mhz) ?
 			    ((ht_info->bCurShortGI40MHz) ? 1 : 0) :
 			    ((ht_info->bCurShortGI20MHz) ? 1 : 0);
 	return MCS_DATA_RATE[is40MHz][is_short_gi][(n_mcs_rate & 0x7f)];
@@ -575,7 +575,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee)
 
 	ht_info->current_ht_support = false;
 
-	ht_info->bCurBW40MHz = false;
+	ht_info->b_cur_bw_40mhz = false;
 	ht_info->cur_tx_bw40mhz = false;
 
 	ht_info->bCurShortGI20MHz = false;
@@ -721,7 +721,7 @@ static void HTSetConnectBwModeCallback(struct rtllib_device *ieee)
 {
 	struct rt_hi_throughput *ht_info = ieee->ht_info;
 
-	if (ht_info->bCurBW40MHz) {
+	if (ht_info->b_cur_bw_40mhz) {
 		if (ht_info->CurSTAExtChnlOffset == HT_EXTCHNL_OFFSET_UPPER)
 			ieee->set_chan(ieee->dev,
 				       ieee->current_network.channel + 2);
@@ -766,19 +766,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->b_cur_bw_40mhz = true;
 			ht_info->CurSTAExtChnlOffset = Offset;
 		} else {
-			ht_info->bCurBW40MHz = false;
+			ht_info->b_cur_bw_40mhz = false;
 			ht_info->CurSTAExtChnlOffset = HT_EXTCHNL_OFFSET_NO_EXT;
 		}
 	} else {
-		ht_info->bCurBW40MHz = false;
+		ht_info->b_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->b_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..255867334be0 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->b_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->b_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 9bf679438ad1..a74b92de024e 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->b_cur_bw_40mhz && ht_info->bCurShortGI40MHz)
 		tcb_desc->bUseShortGI = true;
-	else if (!ht_info->bCurBW40MHz && ht_info->bCurShortGI20MHz)
+	else if (!ht_info->b_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->b_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->b_cur_bw_40mhz && (HTOpMode == 2 ||
 						      HTOpMode == 3)) ||
-			     (!ht_info->bCurBW40MHz && HTOpMode == 3)) {
+			     (!ht_info->b_cur_bw_40mhz && HTOpMode == 3)) {
 				tcb_desc->rts_rate = MGN_24M;
 				tcb_desc->bRTSEnable = true;
 				break;
-- 
2.41.0

Re: [PATCH 3/5] staging: rtl8192e: renamed variable bCurBW40MHz

[Greg KH]

On Sat, Nov 25, 2023 at 05:34:30PM -0500, Gary Rookard wrote:
> Renamed from CamelCase to Snake case the variable bCurBW40MHz.
> bCurBW40MHz -> b_cur_bw_40mhz

Same here, why keep the "b"?  "b" usually means "byte" which of course
means nothing here, so it can be dropped.

thanks,

greg k-h

Re: [PATCH 3/5] staging: rtl8192e: renamed variable bCurBW40MHz

[Gary Rookard]

Greg KH <gregkh@linuxfoundation.org> writes:

> On Sat, Nov 25, 2023 at 05:34:30PM -0500, Gary Rookard wrote:
>> Renamed from CamelCase to Snake case the variable bCurBW40MHz.
>> bCurBW40MHz -> b_cur_bw_40mhz
>
> Same here, why keep the "b"?  "b" usually means "byte" which of course
> means nothing here, so it can be dropped.
>
> thanks,
>
> greg k-h

Okay, will redo.

Regards,
Gary

[PATCH 4/5] staging: rtl8192e: renamed variable nDataRate

[Gary Rookard]

Renamed from CamelCase to Snake case the variable nDataRate.

Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8192e compiles.

Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
 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 f4de5ad7d9d1..82681d21ed2b 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 n_mcs_rate)
 	return MCS_DATA_RATE[is40MHz][is_short_gi][(n_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 n_data_rate)
 {
 	u16	CCKOFDMRate[12] = {0x02, 0x04, 0x0b, 0x16, 0x0c, 0x12, 0x18,
 				   0x24, 0x30, 0x48, 0x60, 0x6c};
 	u8	is40MHz = 0;
 	u8	is_short_gi = 0;
 
-	if (nDataRate < 12)
-		return CCKOFDMRate[nDataRate];
-	if (nDataRate >= 0x10 && nDataRate <= 0x1f) {
+	if (n_data_rate < 12)
+		return CCKOFDMRate[n_data_rate];
+	if (n_data_rate >= 0x10 && n_data_rate <= 0x1f) {
 		is40MHz = 0;
 		is_short_gi = 0;
-	} else if (nDataRate >= 0x20  && nDataRate <= 0x2f) {
+	} else if (n_data_rate >= 0x20  && n_data_rate <= 0x2f) {
 		is40MHz = 1;
 		is_short_gi = 0;
-	} else if (nDataRate >= 0x30  && nDataRate <= 0x3f) {
+	} else if (n_data_rate >= 0x30  && n_data_rate <= 0x3f) {
 		is40MHz = 0;
 		is_short_gi = 1;
-	} else if (nDataRate >= 0x40  && nDataRate <= 0x4f) {
+	} else if (n_data_rate >= 0x40  && n_data_rate <= 0x4f) {
 		is40MHz = 1;
 		is_short_gi = 1;
 	}
-	return MCS_DATA_RATE[is40MHz][is_short_gi][nDataRate & 0xf];
+	return MCS_DATA_RATE[is40MHz][is_short_gi][n_data_rate & 0xf];
 }
 
 bool is_ht_half_nmode_aps(struct rtllib_device *ieee)
-- 
2.41.0

Re: [PATCH 4/5] staging: rtl8192e: renamed variable nDataRate

[Greg KH]

On Sat, Nov 25, 2023 at 05:34:31PM -0500, Gary Rookard wrote:
> -u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 nDataRate)
> +u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 n_data_rate)

Why are you keeping the "n"?  It's not needed, right?  Remember, these
were written in "Hungarian notation" which uses the variable name to
denote the type of the variable, so "n" means "number" perhaps?  So it
can be dropped.

thanks,

greg k-h

Re: [PATCH 4/5] staging: rtl8192e: renamed variable nDataRate

[Gary Rookard]

Greg KH <gregkh@linuxfoundation.org> writes:

> On Sat, Nov 25, 2023 at 05:34:31PM -0500, Gary Rookard wrote:
>> -u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 nDataRate)
>> +u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 n_data_rate)
>
> Why are you keeping the "n"?  It's not needed, right?  Remember, these
> were written in "Hungarian notation" which uses the variable name to
> denote the type of the variable, so "n" means "number" perhaps?  So it
> can be dropped.
>
> thanks,
>
> greg k-h

Okay, will redo.

Regards,
Gary

[PATCH 5/5] staging: rtl8192e: renamed variable is40MHz

[Gary Rookard]

Renamed from CamelCase to Snake case the variable is40MHz.
is40Mhz -> is_40mhz

Linux kernel coding style (cleanup), checkpatch Avoid CamelCase.
Driver/module rtl8291e compiles.

Signed-off-by: Gary Rookard <garyrookard@fastmail.org>
---
 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 82681d21ed2b..606dc54d0f06 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -107,36 +107,36 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 n_mcs_rate)
 {
 	struct rt_hi_throughput *ht_info = ieee->ht_info;
 
-	u8	is40MHz = (ht_info->b_cur_bw_40mhz) ? 1 : 0;
+	u8	is_40mhz = (ht_info->b_cur_bw_40mhz) ? 1 : 0;
 	u8	is_short_gi = (ht_info->b_cur_bw_40mhz) ?
 			    ((ht_info->bCurShortGI40MHz) ? 1 : 0) :
 			    ((ht_info->bCurShortGI20MHz) ? 1 : 0);
-	return MCS_DATA_RATE[is40MHz][is_short_gi][(n_mcs_rate & 0x7f)];
+	return MCS_DATA_RATE[is_40mhz][is_short_gi][(n_mcs_rate & 0x7f)];
 }
 
 u16  tx_count_to_data_rate(struct rtllib_device *ieee, u8 n_data_rate)
 {
 	u16	CCKOFDMRate[12] = {0x02, 0x04, 0x0b, 0x16, 0x0c, 0x12, 0x18,
 				   0x24, 0x30, 0x48, 0x60, 0x6c};
-	u8	is40MHz = 0;
+	u8	is_40mhz = 0;
 	u8	is_short_gi = 0;
 
 	if (n_data_rate < 12)
 		return CCKOFDMRate[n_data_rate];
 	if (n_data_rate >= 0x10 && n_data_rate <= 0x1f) {
-		is40MHz = 0;
+		is_40mhz = 0;
 		is_short_gi = 0;
 	} else if (n_data_rate >= 0x20  && n_data_rate <= 0x2f) {
-		is40MHz = 1;
+		is_40mhz = 1;
 		is_short_gi = 0;
 	} else if (n_data_rate >= 0x30  && n_data_rate <= 0x3f) {
-		is40MHz = 0;
+		is_40mhz = 0;
 		is_short_gi = 1;
 	} else if (n_data_rate >= 0x40  && n_data_rate <= 0x4f) {
-		is40MHz = 1;
+		is_40mhz = 1;
 		is_short_gi = 1;
 	}
-	return MCS_DATA_RATE[is40MHz][is_short_gi][n_data_rate & 0xf];
+	return MCS_DATA_RATE[is_40mhz][is_short_gi][n_data_rate & 0xf];
 }
 
 bool is_ht_half_nmode_aps(struct rtllib_device *ieee)
-- 
2.41.0