Commit d7c2b41f authored by Marco Cesati's avatar Marco Cesati Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove typedefs in odm_DIG.h 



This commit fixes the following checkpatch.pl warnings:

    WARNING: do not add new typedefs
    #11: FILE: hal/odm_DIG.h:11:
    +typedef struct _Dynamic_Initial_Gain_Threshold_ {

    WARNING: do not add new typedefs
    #62: FILE: hal/odm_DIG.h:62:
    +typedef struct false_ALARM_STATISTICS {

    WARNING: do not add new typedefs
    #80: FILE: hal/odm_DIG.h:80:
    +typedef enum tag_Dynamic_Init_Gain_Operation_Type_Definition {

    WARNING: do not add new typedefs
    #91: FILE: hal/odm_DIG.h:91:
    +typedef enum tag_ODM_PauseDIG_Type {

    WARNING: do not add new typedefs
    #96: FILE: hal/odm_DIG.h:96:
    +typedef enum tag_ODM_PauseCCKPD_Type {

Signed-off-by: default avatarMarco Cesati <marco.cesati@gmail.com>
Link: https://lore.kernel.org/r/20210312082638.25512-32-marco.cesati@gmail.com


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

drivers/staging/rtl8723bs/hal/hal_com.c

+1 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ u8 SetHalDefVar( 
			odm->SupportAbility  &= (~DYNAMIC_BB_ANT_DIV);

		} else if (dm_func == 6) {/* turn on all dynamic func */

			if (!(odm->SupportAbility  & DYNAMIC_BB_DIG)) {

				DIG_T	*pDigTable = &odm->DM_DigTable;

				struct DIG_T	*pDigTable = &odm->DM_DigTable;

				pDigTable->CurIGValue = rtw_read8(adapter, 0xc50);

			}

			dm->DMFlag |= DYNAMIC_FUNC_BT;

drivers/staging/rtl8723bs/hal/odm.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ void ODM_DMWatchdog(struct DM_ODM_T * pDM_Odm) 
		odm_DIG(pDM_Odm);



	{

		pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;

		struct DIG_T * pDM_DigTable = &pDM_Odm->DM_DigTable;



		odm_Adaptivity(pDM_Odm, pDM_DigTable->CurIGValue);

	}

drivers/staging/rtl8723bs/hal/odm.h

+3 −3
Original line number Diff line number Diff line
@@ -1110,13 +1110,13 @@ struct DM_ODM_T { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 
	/* ODM Structure */

	/*  */

	struct FAT_T DM_FatTable;

	DIG_T DM_DigTable;

	struct DIG_T DM_DigTable;

	PS_T DM_PSTable;

	struct dynamic_primary_CCA DM_PriCCA;

	struct RXHP_T DM_RXHP_Table;

	struct RA_T DM_RA_Table;

	false_ALARM_STATISTICS FalseAlmCnt;

	false_ALARM_STATISTICS FlaseAlmCntBuddyAdapter;

	struct false_ALARM_STATISTICS FalseAlmCnt;

	struct false_ALARM_STATISTICS FlaseAlmCntBuddyAdapter;

	struct SWAT_T DM_SWAT_Table;

	bool RSSI_test;

	struct CFO_TRACKING DM_CfoTrack;

drivers/staging/rtl8723bs/hal/odm_DIG.c

+13 −13
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void odm_NHMBB(void *pDM_VOID) 
{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	/* u8 test_status; */

	/* Pfalse_ALARM_STATISTICS pFalseAlmCnt = &(pDM_Odm->FalseAlmCnt); */

	/* struct false_ALARM_STATISTICS *pFalseAlmCnt = &(pDM_Odm->FalseAlmCnt); */



	pDM_Odm->NHMCurTxOkcnt =

		*(pDM_Odm->pNumTxBytesUnicast)-pDM_Odm->NHMLastTxOkcnt;
@@ -323,7 +323,7 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI) 
void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;

	struct DIG_T * pDM_DigTable = &pDM_Odm->DM_DigTable;



	if (pDM_DigTable->bStopDIG) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("Stop Writing IGI\n"));
@@ -358,12 +358,12 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI) 


void odm_PauseDIG(

	void *pDM_VOID,

	ODM_Pause_DIG_TYPE PauseType,

	enum ODM_Pause_DIG_TYPE PauseType,

	u8 IGIValue

)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;

	struct DIG_T * pDM_DigTable = &pDM_Odm->DM_DigTable;

	static bool bPaused;



	ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_PauseDIG() =========>\n"));
@@ -467,7 +467,7 @@ bool odm_DigAbort(void *pDM_VOID) 
void odm_DIGInit(void *pDM_VOID)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;

	struct DIG_T * pDM_DigTable = &pDM_Odm->DM_DigTable;



	pDM_DigTable->bStopDIG = false;

	pDM_DigTable->bPSDInProgress = false;
@@ -507,8 +507,8 @@ void odm_DIG(void *pDM_VOID) 
	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;



	/*  Common parameters */

	pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;

	Pfalse_ALARM_STATISTICS pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;

	struct DIG_T * pDM_DigTable = &pDM_Odm->DM_DigTable;

	struct false_ALARM_STATISTICS *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;

	bool FirstConnect, FirstDisConnect;

	u8 DIG_MaxOfMin, DIG_Dynamic_MIN;

	u8 dm_dig_max, dm_dig_min;
@@ -824,7 +824,7 @@ void odm_DIG(void *pDM_VOID) 
void odm_DIGbyRSSI_LPS(void *pDM_VOID)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	Pfalse_ALARM_STATISTICS pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;

	struct false_ALARM_STATISTICS *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;



	u8 RSSI_Lower = DM_DIG_MIN_NIC;   /* 0x1E or 0x1C */

	u8 CurrentIGI = pDM_Odm->RSSI_Min;
@@ -893,7 +893,7 @@ void odm_DIGbyRSSI_LPS(void *pDM_VOID) 
void odm_FalseAlarmCounterStatistics(void *pDM_VOID)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	Pfalse_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	struct false_ALARM_STATISTICS * FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	u32 ret_value;



	if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
@@ -1079,8 +1079,8 @@ void odm_FAThresholdCheck( 
u8 odm_ForbiddenIGICheck(void *pDM_VOID, u8 DIG_Dynamic_MIN, u8 CurrentIGI)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;

	Pfalse_ALARM_STATISTICS pFalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	struct DIG_T * pDM_DigTable = &pDM_Odm->DM_DigTable;

	struct false_ALARM_STATISTICS * pFalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	u8 rx_gain_range_min = pDM_DigTable->rx_gain_range_min;



	if (pFalseAlmCnt->Cnt_all > 10000) {
@@ -1135,7 +1135,7 @@ u8 odm_ForbiddenIGICheck(void *pDM_VOID, u8 DIG_Dynamic_MIN, u8 CurrentIGI) 
void odm_CCKPacketDetectionThresh(void *pDM_VOID)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	Pfalse_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	struct false_ALARM_STATISTICS * FalseAlmCnt = &(pDM_Odm->FalseAlmCnt);

	u8 CurCCK_CCAThres;
@@ -1196,7 +1196,7 @@ void odm_CCKPacketDetectionThresh(void *pDM_VOID) 
void ODM_Write_CCK_CCA_Thres(void *pDM_VOID, u8 CurCCK_CCAThres)

{

	struct DM_ODM_T * pDM_Odm = (struct DM_ODM_T *)pDM_VOID;

	pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;

	struct DIG_T * pDM_DigTable = &pDM_Odm->DM_DigTable;



	/* modify by Guo.Mingzhi 2012-01-03 */

	if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres)

drivers/staging/rtl8723bs/hal/odm_DIG.h

+11 −11
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef __ODMDIG_H__

#define __ODMDIG_H__



typedef struct _Dynamic_Initial_Gain_Threshold_ {

struct DIG_T { /* _Dynamic_Initial_Gain_Threshold_ */

	bool bStopDIG;

	bool bPSDInProgress;
@@ -57,9 +57,9 @@ typedef struct _Dynamic_Initial_Gain_Threshold_ { 
	u32 RSSI_max;



	u8 *pbP2pLinkInProgress;

} DIG_T, *pDIG_T;

};



typedef struct false_ALARM_STATISTICS {

struct  false_ALARM_STATISTICS {

	u32 Cnt_Parity_Fail;

	u32 Cnt_Rate_Illegal;

	u32 Cnt_Crc8_fail;
@@ -75,9 +75,9 @@ typedef struct false_ALARM_STATISTICS { 
	u32 Cnt_CCA_all;

	u32 Cnt_BW_USC; /* Gary */

	u32 Cnt_BW_LSC; /* Gary */

} false_ALARM_STATISTICS, *Pfalse_ALARM_STATISTICS;

};



typedef enum tag_Dynamic_Init_Gain_Operation_Type_Definition {

enum DM_DIG_OP_E { /* tag_Dynamic_Init_Gain_Operation_Type_Definition */

	DIG_TYPE_THRESH_HIGH = 0,

	DIG_TYPE_THRESH_LOW = 1,

	DIG_TYPE_BACKOFF = 2,
@@ -86,17 +86,17 @@ typedef enum tag_Dynamic_Init_Gain_Operation_Type_Definition { 
	DIG_TYPE_ENABLE = 5,

	DIG_TYPE_DISABLE = 6,

	DIG_OP_TYPE_MAX

} DM_DIG_OP_E;

};



typedef enum tag_ODM_PauseDIG_Type {

enum ODM_Pause_DIG_TYPE {

	ODM_PAUSE_DIG = BIT0,

	ODM_RESUME_DIG = BIT1

} ODM_Pause_DIG_TYPE;

};



typedef enum tag_ODM_PauseCCKPD_Type {

enum ODM_Pause_CCKPD_TYPE {

	ODM_PAUSE_CCKPD = BIT0,

	ODM_RESUME_CCKPD = BIT1

} ODM_Pause_CCKPD_TYPE;

};



#define		DM_DIG_THRESH_HIGH			40

#define		DM_DIG_THRESH_LOW			35
@@ -157,7 +157,7 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI); 


void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI);



void odm_PauseDIG(void *pDM_VOID, ODM_Pause_DIG_TYPE PauseType, u8 IGIValue);

void odm_PauseDIG(void *pDM_VOID, enum ODM_Pause_DIG_TYPE PauseType, u8 IGIValue);



void odm_DIGInit(void *pDM_VOID);