Commit 4b224bcb authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: clean up struct rtw_dig 



Remove unused and set but never used fields from struct rtw_dig.

Acked-by: default avatarMartin Kaiser <martin@kaiser.cx>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220102131141.12310-6-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73157fe8

drivers/staging/r8188eu/hal/odm.c

+0 −11
Original line number Diff line number Diff line
@@ -146,24 +146,14 @@ static void odm_DIGInit(struct odm_dm_struct *pDM_Odm) 
	struct adapter *adapter = pDM_Odm->Adapter;



	pDM_DigTable->CurIGValue = (u8)rtl8188e_PHY_QueryBBReg(adapter, ODM_REG_IGI_A_11N, ODM_BIT_IGI_11N);

	pDM_DigTable->RssiLowThresh	= DM_DIG_THRESH_LOW;

	pDM_DigTable->RssiHighThresh	= DM_DIG_THRESH_HIGH;

	pDM_DigTable->FALowThresh	= DM_false_ALARM_THRESH_LOW;

	pDM_DigTable->FAHighThresh	= DM_false_ALARM_THRESH_HIGH;

	pDM_DigTable->rx_gain_range_max = DM_DIG_MAX_NIC;

	pDM_DigTable->rx_gain_range_min = DM_DIG_MIN_NIC;

	pDM_DigTable->BackoffVal = DM_DIG_BACKOFF_DEFAULT;

	pDM_DigTable->BackoffVal_range_max = DM_DIG_BACKOFF_MAX;

	pDM_DigTable->BackoffVal_range_min = DM_DIG_BACKOFF_MIN;

	pDM_DigTable->PreCCK_CCAThres = 0xFF;

	pDM_DigTable->CurCCK_CCAThres = 0x83;

	pDM_DigTable->ForbiddenIGI = DM_DIG_MIN_NIC;

	pDM_DigTable->LargeFAHit = 0;

	pDM_DigTable->Recover_cnt = 0;

	pDM_DigTable->DIG_Dynamic_MIN_0 = DM_DIG_MIN_NIC;

	pDM_DigTable->DIG_Dynamic_MIN_1 = DM_DIG_MIN_NIC;

	pDM_DigTable->bMediaConnect_0 = false;

	pDM_DigTable->bMediaConnect_1 = false;



	/* To Initialize pDM_Odm->bDMInitialGainEnable == false to avoid DIG error */

	pDM_Odm->bDMInitialGainEnable = true;
@@ -771,7 +761,6 @@ void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8 CurCCK_CCAThres) 


	if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres)		/* modify by Guo.Mingzhi 2012-01-03 */

		rtw_write8(pDM_Odm->Adapter, ODM_REG_CCK_CCA_11N, CurCCK_CCAThres);

	pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres;

	pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres;

}

drivers/staging/r8188eu/include/odm.h

+0 −32
Original line number Diff line number Diff line
@@ -5,43 +5,21 @@ 
#define __HALDMOUTSRC_H__



struct rtw_dig {

	u8		Dig_Enable_Flag;

	u8		Dig_Ext_Port_Stage;



	int		RssiLowThresh;

	int		RssiHighThresh;



	u32		FALowThresh;

	u32		FAHighThresh;



	u8		CurSTAConnectState;

	u8		PreSTAConnectState;

	u8		CurMultiSTAConnectState;



	u8		PreIGValue;

	u8		CurIGValue;

	u8		BackupIGValue;



	s8		BackoffVal;

	s8		BackoffVal_range_max;

	s8		BackoffVal_range_min;

	u8		rx_gain_range_max;

	u8		rx_gain_range_min;

	u8		Rssi_val_min;



	u8		PreCCK_CCAThres;

	u8		CurCCK_CCAThres;

	u8		PreCCKPDState;

	u8		CurCCKPDState;



	u8		LargeFAHit;

	u8		ForbiddenIGI;

	u32		Recover_cnt;



	u8		DIG_Dynamic_MIN_0;

	u8		DIG_Dynamic_MIN_1;

	bool		bMediaConnect_0;

	bool		bMediaConnect_1;



	u32		AntDiv_RSSI_max;

	u32		RSSI_max;
@@ -482,12 +460,6 @@ enum odm_bb_config_type { 
    CONFIG_BB_PHY_REG_PG,

};



#define		DM_DIG_THRESH_HIGH	40

#define		DM_DIG_THRESH_LOW	35



#define		DM_false_ALARM_THRESH_LOW	400

#define		DM_false_ALARM_THRESH_HIGH	1000



#define		DM_DIG_MAX_NIC			0x4e

#define		DM_DIG_MIN_NIC			0x1e /* 0x22/0x1c */
@@ -499,10 +471,6 @@ enum odm_bb_config_type { 
#define		DM_DIG_FA_TH1			0x300/* 0x100 */

#define		DM_DIG_FA_TH2			0x400/* 0x200 */



#define		DM_DIG_BACKOFF_MAX		12

#define		DM_DIG_BACKOFF_MIN		-4

#define		DM_DIG_BACKOFF_DEFAULT		10



/* 3=========================================================== */

/* 3 Rate Adaptive */

/* 3=========================================================== */