* [PATCH 1/4] staging: rtl8188eu: convert variables from unsigned char to u8
2019-10-03 12:25 [PATCH 0/4] staging: rtl8188eu: cleanups in update_hw_ht_param() Michael Straube
@ 2019-10-03 12:25 ` Michael Straube
2019-10-03 12:25 ` [PATCH 2/4] staging: rtl8188eu: rename variables to avoid mixed case Michael Straube
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2019-10-03 12:25 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, devel, linux-kernel, Michael Straube
Convert the local variables max_AMPDU_len and min_MPDU_spacing from
unsigned char to u8 and remove unnecessary castings to u8 pointer.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_ap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 51a5b71f8c25..1e4461a74474 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -560,8 +560,8 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
static void update_hw_ht_param(struct adapter *padapter)
{
- unsigned char max_AMPDU_len;
- unsigned char min_MPDU_spacing;
+ u8 max_AMPDU_len;
+ u8 min_MPDU_spacing;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -576,9 +576,9 @@ static void update_hw_ht_param(struct adapter *padapter)
min_MPDU_spacing = (pmlmeinfo->HT_caps.ampdu_params_info & 0x1c) >> 2;
- rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, (u8 *)(&min_MPDU_spacing));
+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, &min_MPDU_spacing);
- rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));
+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, &max_AMPDU_len);
/* */
/* Config SM Power Save setting */
--
2.23.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/4] staging: rtl8188eu: rename variables to avoid mixed case
2019-10-03 12:25 [PATCH 0/4] staging: rtl8188eu: cleanups in update_hw_ht_param() Michael Straube
2019-10-03 12:25 ` [PATCH 1/4] staging: rtl8188eu: convert variables from unsigned char to u8 Michael Straube
@ 2019-10-03 12:25 ` Michael Straube
2019-10-03 12:25 ` [PATCH 3/4] staging: rtl8188eu: cleanup whitespace in update_hw_ht_param Michael Straube
2019-10-03 12:25 ` [PATCH 4/4] staging: rtl8188eu: cleanup comments " Michael Straube
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2019-10-03 12:25 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, devel, linux-kernel, Michael Straube
Rename the local varibles max_AMPDU_len and min_MPDU_spacing to avoid
mixed case.
max_AMPDU_len -> max_ampdu_len
min_MPDU_spacing -> min_mpdu_spacing
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_ap.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 1e4461a74474..75c34e8f2335 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -560,8 +560,8 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
static void update_hw_ht_param(struct adapter *padapter)
{
- u8 max_AMPDU_len;
- u8 min_MPDU_spacing;
+ u8 max_ampdu_len;
+ u8 min_mpdu_spacing;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
@@ -572,13 +572,13 @@ static void update_hw_ht_param(struct adapter *padapter)
ampdu_params_info [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k
ampdu_params_info [4:2]:Min MPDU Start Spacing
*/
- max_AMPDU_len = pmlmeinfo->HT_caps.ampdu_params_info & 0x03;
+ max_ampdu_len = pmlmeinfo->HT_caps.ampdu_params_info & 0x03;
- min_MPDU_spacing = (pmlmeinfo->HT_caps.ampdu_params_info & 0x1c) >> 2;
+ min_mpdu_spacing = (pmlmeinfo->HT_caps.ampdu_params_info & 0x1c) >> 2;
- rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, &min_MPDU_spacing);
+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, &min_mpdu_spacing);
- rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, &max_AMPDU_len);
+ rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, &max_ampdu_len);
/* */
/* Config SM Power Save setting */
--
2.23.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] staging: rtl8188eu: cleanup whitespace in update_hw_ht_param
2019-10-03 12:25 [PATCH 0/4] staging: rtl8188eu: cleanups in update_hw_ht_param() Michael Straube
2019-10-03 12:25 ` [PATCH 1/4] staging: rtl8188eu: convert variables from unsigned char to u8 Michael Straube
2019-10-03 12:25 ` [PATCH 2/4] staging: rtl8188eu: rename variables to avoid mixed case Michael Straube
@ 2019-10-03 12:25 ` Michael Straube
2019-10-03 12:25 ` [PATCH 4/4] staging: rtl8188eu: cleanup comments " Michael Straube
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2019-10-03 12:25 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, devel, linux-kernel, Michael Straube
Replace tabs with spaces in declarations and reomve two blank lines in
update_hw_ht_param to cleanup whitespace and improve readability.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_ap.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 75c34e8f2335..97cab71cef23 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -562,8 +562,8 @@ static void update_hw_ht_param(struct adapter *padapter)
{
u8 max_ampdu_len;
u8 min_mpdu_spacing;
- struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
- struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
+ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
+ struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
DBG_88E("%s\n", __func__);
@@ -573,11 +573,9 @@ static void update_hw_ht_param(struct adapter *padapter)
ampdu_params_info [4:2]:Min MPDU Start Spacing
*/
max_ampdu_len = pmlmeinfo->HT_caps.ampdu_params_info & 0x03;
-
min_mpdu_spacing = (pmlmeinfo->HT_caps.ampdu_params_info & 0x1c) >> 2;
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, &min_mpdu_spacing);
-
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, &max_ampdu_len);
/* */
--
2.23.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] staging: rtl8188eu: cleanup comments in update_hw_ht_param
2019-10-03 12:25 [PATCH 0/4] staging: rtl8188eu: cleanups in update_hw_ht_param() Michael Straube
` (2 preceding siblings ...)
2019-10-03 12:25 ` [PATCH 3/4] staging: rtl8188eu: cleanup whitespace in update_hw_ht_param Michael Straube
@ 2019-10-03 12:25 ` Michael Straube
3 siblings, 0 replies; 5+ messages in thread
From: Michael Straube @ 2019-10-03 12:25 UTC (permalink / raw)
To: gregkh; +Cc: Larry.Finger, devel, linux-kernel, Michael Straube
Cleanup comments in update_hw_ht_param to follow kernel coding style
and avoid line length over 80 characters.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_ap.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_ap.c b/drivers/staging/rtl8188eu/core/rtw_ap.c
index 97cab71cef23..9aa44c921aca 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ap.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ap.c
@@ -567,20 +567,17 @@ static void update_hw_ht_param(struct adapter *padapter)
DBG_88E("%s\n", __func__);
- /* handle A-MPDU parameter field */
- /*
- ampdu_params_info [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k
- ampdu_params_info [4:2]:Min MPDU Start Spacing
- */
+ /* handle A-MPDU parameter field
+ * ampdu_params_info [1:0]:Max AMPDU Len => 0:8k , 1:16k, 2:32k, 3:64k
+ * ampdu_params_info [4:2]:Min MPDU Start Spacing
+ */
max_ampdu_len = pmlmeinfo->HT_caps.ampdu_params_info & 0x03;
min_mpdu_spacing = (pmlmeinfo->HT_caps.ampdu_params_info & 0x1c) >> 2;
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_MIN_SPACE, &min_mpdu_spacing);
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, &max_ampdu_len);
- /* */
- /* Config SM Power Save setting */
- /* */
+ /* Config SM Power Save setting */
pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.cap_info) & 0x0C) >> 2;
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __func__);
--
2.23.0
^ permalink raw reply related [flat|nested] 5+ messages in thread