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

staging: r8188eu: remove duplicate structure 



The structures odm_phy_status_info and phy_info are redundant.
Keep phy_info and remove odm_phy_status_info.

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


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

drivers/staging/r8188eu/hal/odm_HWConfig.c

+6 −6
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static u8 odm_evm_db_to_percentage(s8 value) 
}



static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm,

			struct odm_phy_status_info *pPhyInfo,

			struct phy_info *pPhyInfo,

			u8 *pPhyStatus,

			struct odm_per_pkt_info *pPktinfo,

			struct adapter *adapt)
@@ -137,7 +137,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, 


		pPhyInfo->RxPWDBAll = PWDB_ALL;

		pPhyInfo->BTRxRSSIPercentage = PWDB_ALL;

		pPhyInfo->RecvSignalPower = rx_pwr_all;

		pPhyInfo->recvpower = rx_pwr_all;

		/*  (3) Get Signal Quality (EVM) */

		if (pPktinfo->bPacketMatchBSSID) {

			u8 SQ, SQ_rpt;
@@ -193,7 +193,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, 
		pPhyInfo->RxPWDBAll = PWDB_ALL;

		pPhyInfo->BTRxRSSIPercentage = PWDB_ALL_BT;

		pPhyInfo->RxPower = rx_pwr_all;

		pPhyInfo->RecvSignalPower = rx_pwr_all;

		pPhyInfo->recvpower = rx_pwr_all;



		/*  (3)EVM of HT rate */

		if (pPktinfo->Rate >= DESC92C_RATEMCS8 && pPktinfo->Rate <= DESC92C_RATEMCS15)
@@ -230,7 +230,7 @@ static void odm_RxPhyStatus92CSeries_Parsing(struct odm_dm_struct *dm_odm, 
}



static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm,

				  struct odm_phy_status_info *pPhyInfo,

				  struct phy_info *pPhyInfo,

				  struct odm_per_pkt_info *pPktinfo)

{

	s32 UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK;
@@ -366,7 +366,7 @@ static void odm_Process_RSSIForDM(struct odm_dm_struct *dm_odm, 


/*  Endianness before calling this API */

static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm,

					 struct odm_phy_status_info *pPhyInfo,

					 struct phy_info *pPhyInfo,

					 u8 *pPhyStatus,

					 struct odm_per_pkt_info *pPktinfo,

					 struct adapter *adapt)
@@ -378,7 +378,7 @@ static void ODM_PhyStatusQuery_92CSeries(struct odm_dm_struct *dm_odm, 
}



void ODM_PhyStatusQuery(struct odm_dm_struct *dm_odm,

			struct odm_phy_status_info *pPhyInfo,

			struct phy_info *pPhyInfo,

			u8 *pPhyStatus, struct odm_per_pkt_info *pPktinfo,

			struct adapter *adapt)

{

drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ void update_recvframe_phyinfo_88e(struct recv_frame *precvframe, struct phy_stat 
	struct adapter *padapter = precvframe->adapter;

	struct rx_pkt_attrib *pattrib = &precvframe->attrib;

	struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);

	struct odm_phy_status_info *pPHYInfo  = (struct odm_phy_status_info *)(&pattrib->phy_info);

	struct phy_info *pPHYInfo  = &pattrib->phy_info;

	u8 *wlanhdr;

	struct odm_per_pkt_info	pkt_info;

	u8 *sa = NULL;

drivers/staging/r8188eu/include/odm.h

+0 −17
Original line number Diff line number Diff line
@@ -168,23 +168,6 @@ struct odm_rate_adapt { 


#define	DM_Type_ByDriver	1



/*  Declare for common info */



struct odm_phy_status_info {

	u8	RxPWDBAll;

	u8	SignalQuality;	 /*  in 0-100 index. */

	u8	RxMIMOSignalQuality[MAX_PATH_NUM_92CS]; /* EVM */

	u8	RxMIMOSignalStrength[MAX_PATH_NUM_92CS];/*  in 0~100 index */

	s8	RxPower; /*  in dBm Translate from PWdB */

	s8	RecvSignalPower;/*  Real power in dBm for this packet, no

				 * beautification and aggregation. Keep this raw

				 * info to be used for the other procedures. */

	u8	BTRxRSSIPercentage;

	u8	SignalStrength; /*  in 0-100 index. */

	u8	RxPwr[MAX_PATH_NUM_92CS];/* per-path's pwdb */

	u8	RxSNR[MAX_PATH_NUM_92CS];/* per-path's SNR */

};



struct odm_phy_dbg_info {

	/* ODM Write,debug info */

	s8	RxSNRdB[MAX_PATH_NUM_92CS];

drivers/staging/r8188eu/include/odm_HWConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ struct phy_status_rpt { 
};



void ODM_PhyStatusQuery(struct odm_dm_struct *pDM_Odm,

			struct odm_phy_status_info *pPhyInfo,

			struct phy_info *pPhyInfo,

			u8 *pPhyStatus,

			struct odm_per_pkt_info *pPktinfo,

			struct adapter *adapt);