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

staging: rtl8723bs: remove typedefs in odm_types.h 



This commit fixes the following checkpatch.pl warnings:

    WARNING: do not add new typedefs
    #18: FILE: hal/odm_types.h:18:
    +typedef enum _HAL_STATUS {

    WARNING: do not add new typedefs
    #33: FILE: hal/odm_types.h:33:
    +typedef enum _RT_SPINLOCK_TYPE {

    WARNING: do not add new typedefs
    #77: FILE: hal/odm_types.h:77:
    +   typedef struct timer_list RT_TIMER, *PRT_TIMER;

    WARNING: do not add new typedefs
    #78: FILE: hal/odm_types.h:78:
    +   typedef  void *RT_TIMER_CALL_BACK;

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


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

drivers/staging/rtl8723bs/hal/odm.h

+9 −9
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct RXHP_T { 
	bool First_time_enter;

	bool RXHP_enable;

	u8 TP_Mode;

	RT_TIMER PSDTimer;

	struct timer_list PSDTimer;

};



#define ASSOCIATE_ENTRY_NUM					32 /*  Max size of AsocEntry[]. */
@@ -169,8 +169,8 @@ struct SWAT_T { /* _SW_Antenna_Switch_ */ 
	u8 TrafficLoad;

	u8 Train_time;

	u8 Train_time_flag;

	RT_TIMER SwAntennaSwitchTimer;

	RT_TIMER SwAntennaSwitchTimer_8723B;

	struct timer_list SwAntennaSwitchTimer;

	struct timer_list SwAntennaSwitchTimer_8723B;

	u32 PktCnt_SWAntDivByCtrlFrame;

	bool bSWAntDivByCtrlFrame;

};
@@ -868,7 +868,7 @@ struct ANT_DETECTED_INFO { 
/*  2011/09/22 MH Copy from SD4 defined structure. We use to support PHY DM integration. */

/*  */

struct DM_ODM_T { /* DM_Out_Source_Dynamic_Mechanism_Structure */

	/* RT_TIMER	FastAntTrainingTimer; */

	/* struct timer_list	FastAntTrainingTimer; */

	/*  */

	/* 	Add for different team use temporarily */

	/*  */
@@ -1146,14 +1146,14 @@ struct DM_ODM_T { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 


	/* PSD */

	bool bUserAssignLevel;

	RT_TIMER PSDTimer;

	struct timer_list PSDTimer;

	u8 RSSI_BT;			/* come from BT */

	bool bPSDinProcess;

	bool bPSDactive;

	bool bDMInitialGainEnable;



	/* MPT DIG */

	RT_TIMER MPT_DIGTimer;

	struct timer_list MPT_DIGTimer;



	/* for rate adaptive, in fact,  88c/92c fw will handle this */

	u8 bUseRAMask;
@@ -1194,10 +1194,10 @@ struct DM_ODM_T { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 
	/*  */



	/*  ODM relative time. */

	RT_TIMER PathDivSwitchTimer;

	struct timer_list PathDivSwitchTimer;

	/* 2011.09.27 add for Path Diversity */

	RT_TIMER CCKPathDiversityTimer;

	RT_TIMER FastAntTrainingTimer;

	struct timer_list CCKPathDiversityTimer;

	struct timer_list FastAntTrainingTimer;



	/*  ODM relative workitem. */

drivers/staging/rtl8723bs/hal/odm_HWConfig.c

+3 −3
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ void ODM_PhyStatusQuery( 
/*  */

/*  */



HAL_STATUS ODM_ConfigRFWithHeaderFile(

enum HAL_STATUS ODM_ConfigRFWithHeaderFile(

	struct DM_ODM_T * pDM_Odm,

	enum ODM_RF_Config_Type ConfigType,

	enum ODM_RF_RADIO_PATH_E eRFPath
@@ -450,7 +450,7 @@ HAL_STATUS ODM_ConfigRFWithHeaderFile( 
	return HAL_STATUS_SUCCESS;

}



HAL_STATUS ODM_ConfigRFWithTxPwrTrackHeaderFile(struct DM_ODM_T * pDM_Odm)

enum HAL_STATUS ODM_ConfigRFWithTxPwrTrackHeaderFile(struct DM_ODM_T * pDM_Odm)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,

				 ("===>ODM_ConfigRFWithTxPwrTrackHeaderFile (%s)\n", (pDM_Odm->bIsMPChip) ? "MPChip" : "TestChip"));
@@ -464,7 +464,7 @@ HAL_STATUS ODM_ConfigRFWithTxPwrTrackHeaderFile(struct DM_ODM_T * pDM_Odm) 
	return HAL_STATUS_SUCCESS;

}



HAL_STATUS ODM_ConfigBBWithHeaderFile(

enum HAL_STATUS ODM_ConfigBBWithHeaderFile(

	struct DM_ODM_T * pDM_Odm, enum ODM_BB_Config_Type ConfigType

)

{

drivers/staging/rtl8723bs/hal/odm_HWConfig.h

+4 −4
Original line number Diff line number Diff line
@@ -128,19 +128,19 @@ void ODM_PhyStatusQuery( 
	struct odm_packet_info *pPktinfo

);



HAL_STATUS ODM_ConfigRFWithTxPwrTrackHeaderFile(struct DM_ODM_T * pDM_Odm);

enum HAL_STATUS ODM_ConfigRFWithTxPwrTrackHeaderFile(struct DM_ODM_T * pDM_Odm);



HAL_STATUS ODM_ConfigRFWithHeaderFile(

enum HAL_STATUS ODM_ConfigRFWithHeaderFile(

	struct DM_ODM_T * pDM_Odm,

	enum ODM_RF_Config_Type ConfigType,

	enum ODM_RF_RADIO_PATH_E eRFPath

);



HAL_STATUS ODM_ConfigBBWithHeaderFile(

enum HAL_STATUS ODM_ConfigBBWithHeaderFile(

	struct DM_ODM_T * pDM_Odm, enum ODM_BB_Config_Type ConfigType

);



HAL_STATUS ODM_ConfigFWWithHeaderFile(

enum HAL_STATUS ODM_ConfigFWWithHeaderFile(

	struct DM_ODM_T * pDM_Odm,

	enum ODM_FW_Config_Type ConfigType,

	u8 *pFirmware,

drivers/staging/rtl8723bs/hal/odm_types.h

+4 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#define GET_ODM(__padapter)	((PDM_ODM_T)(&((GET_HAL_DATA(__padapter))->odmpriv)))



typedef enum _HAL_STATUS {

enum HAL_STATUS {

	HAL_STATUS_SUCCESS,

	HAL_STATUS_FAILURE,

	/*RT_STATUS_PENDING,
@@ -24,13 +24,13 @@ typedef enum _HAL_STATUS { 
	RT_STATUS_INVALID_PARAMETER,

	RT_STATUS_NOT_SUPPORT,

	RT_STATUS_OS_API_FAILED,*/

} HAL_STATUS, *PHAL_STATUS;

};





/*  */

/*  Declare for ODM spin lock definition temporarily from compile pass. */

/*  */

typedef enum _RT_SPINLOCK_TYPE {

enum RT_SPINLOCK_TYPE {

	RT_TX_SPINLOCK = 1,

	RT_RX_SPINLOCK = 2,

	RT_RM_SPINLOCK = 3,
@@ -66,7 +66,7 @@ typedef enum _RT_SPINLOCK_TYPE { 
	RT_PENDED_OID_SPINLOCK = 39,

	RT_CHNLLIST_SPINLOCK = 40,

	RT_INDIC_SPINLOCK = 41,	/* protect indication */

} RT_SPINLOCK_TYPE;

};



	#if defined(__LITTLE_ENDIAN)

		#define	ODM_ENDIAN_TYPE			ODM_ENDIAN_LITTLE
@@ -74,8 +74,6 @@ typedef enum _RT_SPINLOCK_TYPE { 
		#define	ODM_ENDIAN_TYPE			ODM_ENDIAN_BIG

	#endif



	typedef struct timer_list		RT_TIMER, *PRT_TIMER;

	typedef  void *RT_TIMER_CALL_BACK;

	#define	STA_INFO_T			struct sta_info

	#define	PSTA_INFO_T		struct sta_info *