Commit 9d535e92 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove rf type branching (second patch) 



remove RFType field in dm_odm_t struct, keep unconditioned
all code branches related to 1T1R path, delete the others.

Remove unused variable to silence gcc warning.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/fd41fbfba16df2b93a7593c1f853a874255e945c.1628329348.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/odm.c

+10 −34
Original line number Diff line number Diff line
@@ -391,7 +391,6 @@ u32 ODM_Get_Rate_Bitmap( 
	case (ODM_WM_B|ODM_WM_G|ODM_WM_N24G):

	case (ODM_WM_B|ODM_WM_N24G):

	case (ODM_WM_G|ODM_WM_N24G):

		if (pDM_Odm->RFType == ODM_1T2R || pDM_Odm->RFType == ODM_1T1R) {

		if (rssi_level == DM_RATR_STA_HIGH)

			rate_bitmap = 0x000f0000;

		else if (rssi_level == DM_RATR_STA_MIDDLE)
@@ -402,24 +401,9 @@ u32 ODM_Get_Rate_Bitmap( 
			else

				rate_bitmap = 0x000ff005;

		}

		} else {

			if (rssi_level == DM_RATR_STA_HIGH)

				rate_bitmap = 0x0f8f0000;

			else if (rssi_level == DM_RATR_STA_MIDDLE)

				rate_bitmap = 0x0f8ff000;

			else {

				if (*(pDM_Odm->pBandWidth) == ODM_BW40M)

					rate_bitmap = 0x0f8ff015;

				else

					rate_bitmap = 0x0f8ff005;

			}

		}

		break;



	default:

		if (pDM_Odm->RFType == RF_1T2R)

			rate_bitmap = 0x000fffff;

		else

		rate_bitmap = 0x0fffffff;

		break;

	}
@@ -844,10 +828,6 @@ void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 V 
		pDM_Odm->SupportAbility = (u32)Value;

		break;



	case ODM_CMNINFO_RF_TYPE:

		pDM_Odm->RFType = (u8)Value;

		break;



	case ODM_CMNINFO_PLATFORM:

		pDM_Odm->SupportPlatform = (u8)Value;

		break;
@@ -1094,10 +1074,6 @@ void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value) 
		pDM_Odm->SupportAbility = (u32)Value;

		break;



	case ODM_CMNINFO_RF_TYPE:

		pDM_Odm->RFType = (u8)Value;

		break;



	case ODM_CMNINFO_WIFI_DIRECT:

		pDM_Odm->bWIFI_Direct = (bool)Value;

		break;

drivers/staging/rtl8723bs/hal/odm.h

+0 −3
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ enum odm_cmninfo_e { 
	ODM_CMNINFO_IC_TYPE,					/*  ODM_IC_TYPE_E */

	ODM_CMNINFO_CUT_VER,					/*  ODM_CUT_VERSION_E */

	ODM_CMNINFO_FAB_VER,					/*  ODM_FAB_E */

	ODM_CMNINFO_RF_TYPE,					/*  ODM_RF_PATH_E or ODM_RF_TYPE_E? */

	ODM_CMNINFO_RFE_TYPE,

	ODM_CMNINFO_PACKAGE_TYPE,

	ODM_CMNINFO_EXT_LNA,					/*  true */
@@ -422,7 +421,6 @@ enum { /* tag_ODM_Fab_Version_Definition */ 
	ODM_UMC		=	1,

};



/*  ODM_CMNINFO_RF_TYPE */

/*  */

/*  For example 1T2R (A+AB = BIT0|BIT4|BIT5) */

/*  */
@@ -719,7 +717,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */ 
	/*  Fab Version TSMC/UMC = 0/1 */

	u8 FabVersion;

	/*  RF Type 4T4R/3T3R/2T2R/1T2R/1T1R/... */

	u8 RFType;

	u8 RFEType;

	/*  Board Type Normal/HighPower/MiniCard/SLIM/Combo/... = 0/1/2/3/4/... */

	u8 BoardType;

drivers/staging/rtl8723bs/hal/odm_CfoTracking.c

+2 −6
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void ODM_CfoTracking(void *pDM_VOID) 
{

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

	struct cfo_tracking *pCfoTrack = &pDM_Odm->DM_CfoTrack;

	int CFO_kHz_A, CFO_kHz_B, CFO_ave = 0;

	int CFO_kHz_A, CFO_ave = 0;

	int CFO_ave_diff;

	int CrystalCap = (int)pCfoTrack->CrystalCap;

	u8 Adjust_Xtal = 1;
@@ -117,12 +117,8 @@ void ODM_CfoTracking(void *pDM_VOID) 


		/* 4 1.2 Calculate CFO */

		CFO_kHz_A =  (int)(pCfoTrack->CFO_tail[0] * 3125)  / 1280;

		CFO_kHz_B =  (int)(pCfoTrack->CFO_tail[1] * 3125)  / 1280;



		if (pDM_Odm->RFType < ODM_2T2R)

		CFO_ave = CFO_kHz_A;

		else

			CFO_ave = (int)(CFO_kHz_A + CFO_kHz_B) >> 1;



		/* 4 1.3 Avoid abnormal large CFO */

		CFO_ave_diff =

drivers/staging/rtl8723bs/hal/odm_DIG.c

+1 −2
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI) 
		/* 1 Set IGI value */

		PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);



		if (pDM_Odm->RFType > ODM_1T1R)

		PHY_SetBBReg(pDM_Odm->Adapter, ODM_REG(IGI_B, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);



		pDM_DigTable->CurIGValue = CurrentIGI;

drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c

+1 −4
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ static s16 odm_InbandNoise_Monitor_NSeries( 


	pDM_Odm->noise_level.noise_all = 0;



	if ((pDM_Odm->RFType == ODM_1T2R) || (pDM_Odm->RFType == ODM_2T2R))

		max_rf_path = 2;

	else

	max_rf_path = 1;



	memset(&noise_data, 0, sizeof(struct noise_level));