Commit b06c22b2 authored Mar 21, 2022 by Martin Kaiser Committed by Greg Kroah-Hartman Apr 04, 2022

staging: r8188eu: DYNAMIC_BB_DYNAMIC_TXPWR is not used



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>
Link: https://lore.kernel.org/r/20220321203031.143486-4-martin@kaiser.cx


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ea4ec3d1

drivers/staging/r8188eu/core/rtw_wlan_util.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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;

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 */

drivers/staging/r8188eu/include/rtw_mlme_ext.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)