[PATCH 0/6] staging: r8188eu: clean up odm dynamic functions

mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed

* [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions
@ 2022-03-21 20:30 Martin Kaiser
  2022-03-21 20:30 ` [PATCH 1/6] staging: r8188eu: remove two limit defines Martin Kaiser
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Martin Kaiser @ 2022-03-21 20:30 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel, David Laight, Martin Kaiser

Simplify the code for odm dynamic functions. Remove unused capabilities
and intermediate steps.

This should be applied after the "remove local BIT macro" patch.

Martin Kaiser (6):
  staging: r8188eu: remove two limit defines
  staging: r8188eu: remove unused defines for dynamic functions
  staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used
  staging: r8188eu: DYNAMIC_BB_ANT_DIV is not used
  staging: r8188eu: DYNAMIC_RF_CALIBRATION is not used
  staging: r8188eu: refactor dm func set and clear

 drivers/staging/r8188eu/core/rtw_mlme_ext.c   |  6 ++---
 drivers/staging/r8188eu/core/rtw_wlan_util.c  | 12 ---------
 drivers/staging/r8188eu/hal/usb_halinit.c     | 16 +++---------
 drivers/staging/r8188eu/include/hal_intf.h    |  2 +-
 .../staging/r8188eu/include/rtw_mlme_ext.h    | 25 -------------------
 5 files changed, 7 insertions(+), 54 deletions(-)

-- 
2.30.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/6] staging: r8188eu: remove two limit defines
  2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
@ 2022-03-21 20:30 ` Martin Kaiser
  2022-03-21 20:30 ` [PATCH 2/6] staging: r8188eu: remove unused defines for dynamic functions Martin Kaiser
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Martin Kaiser @ 2022-03-21 20:30 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel, David Laight, Martin Kaiser

Remove two unused defines related to limits.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/include/rtw_mlme_ext.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 0c555ea6719b..752fa433544e 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -24,9 +24,6 @@
 
 #define REAUTH_LIMIT	(4)
 #define REASSOC_LIMIT	(4)
-#define READDBA_LIMIT	(2)
-
-#define ROAMING_LIMIT	8
 
 #define	DYNAMIC_FUNC_DISABLE			(0x0)
 
-- 
2.30.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/6] staging: r8188eu: remove unused defines for dynamic functions
  2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
  2022-03-21 20:30 ` [PATCH 1/6] staging: r8188eu: remove two limit defines Martin Kaiser
@ 2022-03-21 20:30 ` Martin Kaiser
  2022-03-21 20:30 ` [PATCH 3/6] staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used Martin Kaiser
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Martin Kaiser @ 2022-03-21 20:30 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel, David Laight, Martin Kaiser

Remove a couple of DYNAMIC_BB_... defines which are not used
by this driver.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/include/rtw_mlme_ext.h | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 752fa433544e..532360c84d66 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -30,26 +30,10 @@
 /*  ====== ODM_ABILITY_E ======== */
 /*  BB ODM section BIT 0-15 */
 #define	DYNAMIC_BB_DIG				BIT(0)
-#define	DYNAMIC_BB_RA_MASK			BIT(1)
 #define	DYNAMIC_BB_DYNAMIC_TXPWR	BIT(2)
-#define	DYNAMIC_BB_BB_FA_CNT			BIT(3)
 
-#define		DYNAMIC_BB_RSSI_MONITOR		BIT(4)
-#define		DYNAMIC_BB_CCK_PD			BIT(5)
 #define		DYNAMIC_BB_ANT_DIV			BIT(6)
-#define		DYNAMIC_BB_PWR_SAVE			BIT(7)
-#define		DYNAMIC_BB_PWR_TRA			BIT(8)
-#define		DYNAMIC_BB_RATE_ADAPTIVE		BIT(9)
-#define		DYNAMIC_BB_PATH_DIV			BIT(10)
-#define		DYNAMIC_BB_PSD				BIT(11)
-
-/*  MAC DM section BIT 16-23 */
-#define		DYNAMIC_MAC_EDCA_TURBO		BIT(16)
-#define		DYNAMIC_MAC_EARLY_MODE		BIT(17)
-
-/*  RF ODM section BIT 24-31 */
-#define		DYNAMIC_RF_TX_PWR_TRACK		BIT(24)
-#define		DYNAMIC_RF_RX_GAIN_TRACK		BIT(25)
+
 #define		DYNAMIC_RF_CALIBRATION		BIT(26)
 
 #define		DYNAMIC_ALL_FUNC_ENABLE		0xFFFFFFF
-- 
2.30.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/6] staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used
  2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
  2022-03-21 20:30 ` [PATCH 1/6] staging: r8188eu: remove two limit defines Martin Kaiser
  2022-03-21 20:30 ` [PATCH 2/6] staging: r8188eu: remove unused defines for dynamic functions Martin Kaiser
@ 2022-03-21 20:30 ` Martin Kaiser
  2022-03-21 20:30 ` [PATCH 4/6] staging: r8188eu: DYNAMIC_BB_ANT_DIV " Martin Kaiser
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Martin Kaiser @ 2022-03-21 20:30 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel, David Laight, Martin Kaiser

Remove the DYNAMIC_BB_DYNAMIC_TXPWR capability. It is cleared but not used.

DYNAMIC_BB_DYNAMIC_TXPWR defines a bit in podmpriv->SupportAbility that's
set or cleared. There's no code that checks this bit explicitly.

There's also no code that makes a copy of SupportAbility and checks the
DYNAMIC_BB_DYNAMIC_TXPWR in the copy. SupportAbility is copied to
podmpriv->BK_SupportAbility. The only use of BK_SupportAbility is to
restore a previously saved value. The other remaining reader of
SupportAbility is a private debug ioctl.

It's safe to assume that DYNAMIC_BB_DYNAMIC_TXPWR is not used, not even
indirectly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/core/rtw_wlan_util.c   | 4 ----
 drivers/staging/r8188eu/hal/usb_halinit.c      | 2 --
 drivers/staging/r8188eu/include/rtw_mlme_ext.h | 1 -
 3 files changed, 7 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index f32401deae9a..2d495a756abf 100644
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -1275,14 +1275,10 @@ void update_IOT_info(struct adapter *padapter)
 	case HT_IOT_PEER_RALINK:
 		pmlmeinfo->turboMode_cts2self = 0;
 		pmlmeinfo->turboMode_rtsen = 1;
-		/* disable high power */
-		Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR), false);
 		break;
 	case HT_IOT_PEER_REALTEK:
 		/* rtw_write16(padapter, 0x4cc, 0xffff); */
 		/* rtw_write16(padapter, 0x546, 0x01c0); */
-		/* disable high power */
-		Switch_DM_Func(padapter, (u32)(~DYNAMIC_BB_DYNAMIC_TXPWR), false);
 		break;
 	default:
 		pmlmeinfo->turboMode_cts2self = 0;
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index a92774352d2d..dda8715beb07 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1431,8 +1431,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
 				podmpriv->SupportAbility = DYNAMIC_FUNC_DISABLE;
 			} else if (dm_func == 1) {/* disable DIG */
 				podmpriv->SupportAbility  &= (~DYNAMIC_BB_DIG);
-			} else if (dm_func == 2) {/* disable High power */
-				podmpriv->SupportAbility  &= (~DYNAMIC_BB_DYNAMIC_TXPWR);
 			} else if (dm_func == 3) {/* disable tx power tracking */
 				podmpriv->SupportAbility  &= (~DYNAMIC_RF_CALIBRATION);
 			} else if (dm_func == 5) {/* disable antenna diversity */
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 532360c84d66..703fb9f2409d 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -30,7 +30,6 @@
 /*  ====== ODM_ABILITY_E ======== */
 /*  BB ODM section BIT 0-15 */
 #define	DYNAMIC_BB_DIG				BIT(0)
-#define	DYNAMIC_BB_DYNAMIC_TXPWR	BIT(2)
 
 #define		DYNAMIC_BB_ANT_DIV			BIT(6)
 
-- 
2.30.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 4/6] staging: r8188eu: DYNAMIC_BB_ANT_DIV is not used
  2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
                   ` (2 preceding siblings ...)
  2022-03-21 20:30 ` [PATCH 3/6] staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used Martin Kaiser
@ 2022-03-21 20:30 ` Martin Kaiser
  2022-03-21 20:30 ` [PATCH 5/6] staging: r8188eu: DYNAMIC_RF_CALIBRATION " Martin Kaiser
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Martin Kaiser @ 2022-03-21 20:30 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel, David Laight, Martin Kaiser

Remove the DYNAMIC_BB_ANT_DIV capability. It's cleared in one place but
never checked.

DYNAMIC_BB_ANT_DIV is part of podmpriv->SupportAbility, there are no
users that check SupportAbility as a whole and use DYNAMIC_BB_ANT_DIV
implicitly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/hal/usb_halinit.c      | 2 --
 drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index dda8715beb07..599d930a5927 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1433,8 +1433,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
 				podmpriv->SupportAbility  &= (~DYNAMIC_BB_DIG);
 			} else if (dm_func == 3) {/* disable tx power tracking */
 				podmpriv->SupportAbility  &= (~DYNAMIC_RF_CALIBRATION);
-			} else if (dm_func == 5) {/* disable antenna diversity */
-				podmpriv->SupportAbility  &= (~DYNAMIC_BB_ANT_DIV);
 			} else if (dm_func == 6) {/* turn on all dynamic func */
 				if (!(podmpriv->SupportAbility  & DYNAMIC_BB_DIG)) {
 					struct rtw_dig *pDigTable = &podmpriv->DM_DigTable;
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 703fb9f2409d..9b9c81fe8543 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -31,8 +31,6 @@
 /*  BB ODM section BIT 0-15 */
 #define	DYNAMIC_BB_DIG				BIT(0)
 
-#define		DYNAMIC_BB_ANT_DIV			BIT(6)
-
 #define		DYNAMIC_RF_CALIBRATION		BIT(26)
 
 #define		DYNAMIC_ALL_FUNC_ENABLE		0xFFFFFFF
-- 
2.30.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 5/6] staging: r8188eu: DYNAMIC_RF_CALIBRATION is not used
  2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
                   ` (3 preceding siblings ...)
  2022-03-21 20:30 ` [PATCH 4/6] staging: r8188eu: DYNAMIC_BB_ANT_DIV " Martin Kaiser
@ 2022-03-21 20:30 ` Martin Kaiser
  2022-03-21 20:30 ` [PATCH 6/6] staging: r8188eu: refactor dm func set and clear Martin Kaiser
  2022-03-21 22:39 ` [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions David Laight
  6 siblings, 0 replies; 8+ messages in thread
From: Martin Kaiser @ 2022-03-21 20:30 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel, David Laight, Martin Kaiser

Remove the DYNAMIC_RF_CALIBRATION capability. It's cleared in one place
but never checked.

DYNAMIC_RF_CALIBRATION is part of podmpriv->SupportAbility, there are no
users that check SupportAbility as a whole and use DYNAMIC_RF_CALIBRATION
implicitly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/hal/usb_halinit.c      | 2 --
 drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 599d930a5927..11dc8834acac 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1431,8 +1431,6 @@ void SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eVariab
 				podmpriv->SupportAbility = DYNAMIC_FUNC_DISABLE;
 			} else if (dm_func == 1) {/* disable DIG */
 				podmpriv->SupportAbility  &= (~DYNAMIC_BB_DIG);
-			} else if (dm_func == 3) {/* disable tx power tracking */
-				podmpriv->SupportAbility  &= (~DYNAMIC_RF_CALIBRATION);
 			} else if (dm_func == 6) {/* turn on all dynamic func */
 				if (!(podmpriv->SupportAbility  & DYNAMIC_BB_DIG)) {
 					struct rtw_dig *pDigTable = &podmpriv->DM_DigTable;
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 9b9c81fe8543..9092e775fc5d 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -31,8 +31,6 @@
 /*  BB ODM section BIT 0-15 */
 #define	DYNAMIC_BB_DIG				BIT(0)
 
-#define		DYNAMIC_RF_CALIBRATION		BIT(26)
-
 #define		DYNAMIC_ALL_FUNC_ENABLE		0xFFFFFFF
 
 #define _HW_STATE_NOLINK_		0x00
-- 
2.30.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 6/6] staging: r8188eu: refactor dm func set and clear
  2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
                   ` (4 preceding siblings ...)
  2022-03-21 20:30 ` [PATCH 5/6] staging: r8188eu: DYNAMIC_RF_CALIBRATION " Martin Kaiser
@ 2022-03-21 20:30 ` Martin Kaiser
  2022-03-21 22:39 ` [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions David Laight
  6 siblings, 0 replies; 8+ messages in thread
From: Martin Kaiser @ 2022-03-21 20:30 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel, David Laight, Martin Kaiser

Refactor the code to set and clear "dm functions".

The only remaining callers of Switch_DM_Func use
Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true) or
Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false).

Remove Switch_DM_Func and call SetHwReg8188EU directly.

For HW_VAR_DM_FUNC_SET, the parameter is always DYNAMIC_ALL_FUNC_ENABLE.
This operation resets podmpriv->SupportAbility to the initial value.
Rename HW_VAR_DM_FUNC_SET to HW_VAR_DM_FUNC_RESET and drop the unused
else branch.

For HW_VAR_DM_FUNC_CLR, the parameter is always DYNAMIC_FUNC_DISABLE
(0x00). We can set podmpriv->SupportAbility to 0 directly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 drivers/staging/r8188eu/core/rtw_mlme_ext.c    |  6 +++---
 drivers/staging/r8188eu/core/rtw_wlan_util.c   |  8 --------
 drivers/staging/r8188eu/hal/usb_halinit.c      | 10 +++-------
 drivers/staging/r8188eu/include/hal_intf.h     |  2 +-
 drivers/staging/r8188eu/include/rtw_mlme_ext.h |  1 -
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 10d5f1222936..96e8d346588b 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -6721,7 +6721,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
 	}
 
 	/* turn on dynamic functions */
-	Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
+	SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_RESET, NULL);
 
 	/*  update IOT-releated issue */
 	update_IOT_info(padapter);
@@ -7122,7 +7122,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
 
 		/* disable dynamic functions, such as high power, DIG */
 		Save_DM_Func_Flag(padapter);
-		Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false);
+		SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, NULL);
 
 		/* cancel link timer */
 		_cancel_timer_ex(&pmlmeext->link_timer);
@@ -7391,7 +7391,7 @@ u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf)
 	if ((pmlmeext->sitesurvey_res.state == SCAN_START) || (pmlmeext->sitesurvey_res.state == SCAN_TXNULL)) {
 		/* disable dynamic functions, such as high power, DIG */
 		Save_DM_Func_Flag(padapter);
-		Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false);
+		SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, NULL);
 
 		/* config the initial gain under scanning, need to write the BB registers */
 		if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index 2d495a756abf..5a1eede57458 100644
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -276,14 +276,6 @@ void Restore_DM_Func_Flag(struct adapter *padapter)
 	SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&saveflag));
 }
 
-void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable)
-{
-	if (enable)
-		SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode));
-	else
-		SetHwReg8188EU(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode));
-}
-
 void Set_MSR(struct adapter *padapter, u8 type)
 {
 	u8 val8;
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 11dc8834acac..789ad11170b2 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1148,15 +1148,11 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
 		else
 			podmpriv->SupportAbility = podmpriv->BK_SupportAbility;
 		break;
-	case HW_VAR_DM_FUNC_SET:
-		if (*((u32 *)val) == DYNAMIC_ALL_FUNC_ENABLE) {
-			podmpriv->SupportAbility =	pdmpriv->InitODMFlag;
-		} else {
-			podmpriv->SupportAbility |= *((u32 *)val);
-		}
+	case HW_VAR_DM_FUNC_RESET:
+		podmpriv->SupportAbility = pdmpriv->InitODMFlag;
 		break;
 	case HW_VAR_DM_FUNC_CLR:
-		podmpriv->SupportAbility &= *((u32 *)val);
+		podmpriv->SupportAbility = 0;
 		break;
 	case HW_VAR_AC_PARAM_BE:
 		haldata->AcParam_BE = ((u32 *)(val))[0];
diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 3cededa4dcfc..6f661c4af358 100644
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -22,7 +22,7 @@ enum hw_variables {
 	HW_VAR_BCN_VALID,
 	HW_VAR_DM_FLAG,
 	HW_VAR_DM_FUNC_OP,
-	HW_VAR_DM_FUNC_SET,
+	HW_VAR_DM_FUNC_RESET,
 	HW_VAR_DM_FUNC_CLR,
 	HW_VAR_AC_PARAM_BE,
 	HW_VAR_ACM_CTRL,
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index 9092e775fc5d..3dde2bd0d77a 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -410,7 +410,6 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen);
 
 void Save_DM_Func_Flag(struct adapter *padapter);
 void Restore_DM_Func_Flag(struct adapter *padapter);
-void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable);
 
 void Set_MSR(struct adapter *padapter, u8 type);
 
-- 
2.30.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* RE: [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions
  2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
                   ` (5 preceding siblings ...)
  2022-03-21 20:30 ` [PATCH 6/6] staging: r8188eu: refactor dm func set and clear Martin Kaiser
@ 2022-03-21 22:39 ` David Laight
  6 siblings, 0 replies; 8+ messages in thread
From: David Laight @ 2022-03-21 22:39 UTC (permalink / raw)
  To: 'Martin Kaiser', Greg Kroah-Hartman
  Cc: Larry Finger, Phillip Potter, Michael Straube, linux-staging,
	linux-kernel

From: Martin Kaiser
> Sent: 21 March 2022 20:30
> 
> Simplify the code for odm dynamic functions. Remove unused capabilities
> and intermediate steps.

Looks like a reasonable first tidyup to me :-)
There is a lot more goop in there!

	David

> 
> This should be applied after the "remove local BIT macro" patch.
> 
> Martin Kaiser (6):
>   staging: r8188eu: remove two limit defines
>   staging: r8188eu: remove unused defines for dynamic functions
>   staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used
>   staging: r8188eu: DYNAMIC_BB_ANT_DIV is not used
>   staging: r8188eu: DYNAMIC_RF_CALIBRATION is not used
>   staging: r8188eu: refactor dm func set and clear
> 
>  drivers/staging/r8188eu/core/rtw_mlme_ext.c   |  6 ++---
>  drivers/staging/r8188eu/core/rtw_wlan_util.c  | 12 ---------
>  drivers/staging/r8188eu/hal/usb_halinit.c     | 16 +++---------
>  drivers/staging/r8188eu/include/hal_intf.h    |  2 +-
>  .../staging/r8188eu/include/rtw_mlme_ext.h    | 25 -------------------
>  5 files changed, 7 insertions(+), 54 deletions(-)
> 
> --
> 2.30.2

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-03-21 22:52 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-21 20:30 [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions Martin Kaiser
2022-03-21 20:30 ` [PATCH 1/6] staging: r8188eu: remove two limit defines Martin Kaiser
2022-03-21 20:30 ` [PATCH 2/6] staging: r8188eu: remove unused defines for dynamic functions Martin Kaiser
2022-03-21 20:30 ` [PATCH 3/6] staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used Martin Kaiser
2022-03-21 20:30 ` [PATCH 4/6] staging: r8188eu: DYNAMIC_BB_ANT_DIV " Martin Kaiser
2022-03-21 20:30 ` [PATCH 5/6] staging: r8188eu: DYNAMIC_RF_CALIBRATION " Martin Kaiser
2022-03-21 20:30 ` [PATCH 6/6] staging: r8188eu: refactor dm func set and clear Martin Kaiser
2022-03-21 22:39 ` [PATCH 0/6] staging: r8188eu: clean up odm dynamic functions David Laight

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®