Commit 284a8037 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove all branchings between 2.4Ghz and 5Ghz band types 



remove all code branchings tied to dual band support. The device
works only on 2.4Ghz band so there's no need to check which
band we are on. Removed all code branches that would be valid
only for 5Ghz for it's dead code. Removed enums, table fields
indexing by band type, function arguments passing current
band type and all other thing related to telling us
which band we are on.

Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/72bb27f6a7b3be607f93f5b406d863dd08376986.1624367071.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c

+1 −3
Original line number Diff line number Diff line
@@ -2222,7 +2222,6 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist) 
	bool bRoam = false;

	bool bScan = false;

	bool bLink = false;

	bool bWifiUnder5G = false;

	bool bWifiUnderBMode = false;

	bool bBtHsOn = false;

	bool bWifiBusy = false;
@@ -2344,7 +2343,6 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist) 
	);

	CL_PRINTF(cliBuf);



	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_UNDER_5G, &bWifiUnder5G);

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_BW, &wifiBw);

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy);

	pBtCoexist->fBtcGet(
@@ -2358,7 +2356,7 @@ void EXhalbtc8723b1ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist) 
		cliBuf,

		BT_TMP_BUF_SIZE,

		"\r\n %-35s = %s / %s/ %s/ AP =%d/ %s ", "Wifi status",

		(bWifiUnder5G ? "5G" : "2.4G"),

		("2.4G"),

		((bWifiUnderBMode) ? "11b" : ((wifiBw == BTC_WIFI_BW_LEGACY) ? "11bg" : (((wifiBw == BTC_WIFI_BW_HT40) ? "HT40" : "HT20")))),

		((!bWifiBusy) ? "idle" : ((wifiTrafficDir == BTC_WIFI_TRAFFIC_TX) ? "uplink" : "downlink")),

		pCoexSta->nScanAPNum,

drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c

+2 −3
Original line number Diff line number Diff line
@@ -2431,7 +2431,7 @@ void EXhalbtc8723b2ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist) 
	u8 *cliBuf = pBtCoexist->cliBuf;

	u8 u1Tmp[4], i, btInfoExt, psTdmaCase = 0;

	u32 u4Tmp[4];

	bool bRoam = false, bScan = false, bLink = false, bWifiUnder5G = false;

	bool bRoam = false, bScan = false, bLink = false;

	bool bBtHsOn = false, bWifiBusy = false;

	s32 wifiRssi = 0, btHsRssi = 0;

	u32 wifiBw, wifiTrafficDir, faOfdm, faCck;
@@ -2522,7 +2522,6 @@ void EXhalbtc8723b2ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist) 
	);

	CL_PRINTF(cliBuf);



	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_UNDER_5G, &bWifiUnder5G);

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_BW, &wifiBw);

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy);

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U4_WIFI_TRAFFIC_DIRECTION, &wifiTrafficDir);
@@ -2530,7 +2529,7 @@ void EXhalbtc8723b2ant_DisplayCoexInfo(struct btc_coexist *pBtCoexist) 
		cliBuf,

		BT_TMP_BUF_SIZE,

		"\r\n %-35s = %s / %s/ %s ", "Wifi status", \

		(bWifiUnder5G ? "5G" : "2.4G"),

		("2.4G"),

		((BTC_WIFI_BW_LEGACY == wifiBw) ? "Legacy" : (((BTC_WIFI_BW_HT40 == wifiBw) ? "HT40" : "HT20"))),

		((!bWifiBusy) ? "idle" : ((BTC_WIFI_TRAFFIC_TX == wifiTrafficDir) ? "uplink" : "downlink"))

	);

drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ enum { 
	BTC_GET_BL_WIFI_LINK,

	BTC_GET_BL_WIFI_ROAM,

	BTC_GET_BL_WIFI_4_WAY_PROGRESS,

	BTC_GET_BL_WIFI_UNDER_5G,

	BTC_GET_BL_WIFI_AP_MODE_ENABLE,

	BTC_GET_BL_WIFI_ENABLE_ENCRYPTION,

	BTC_GET_BL_WIFI_UNDER_B_MODE,

drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c

+8 −9
Original line number Diff line number Diff line
@@ -543,12 +543,12 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct dm_odm_t *pDM_Odm) 
******************************************************************************/



static u32 Array_MP_8723B_PHY_REG_PG[] = {

	0, 0, 0, 0x00000e08, 0x0000ff00, 0x00003800,

	0, 0, 0, 0x0000086c, 0xffffff00, 0x32343600,

	0, 0, 0, 0x00000e00, 0xffffffff, 0x40424444,

	0, 0, 0, 0x00000e04, 0xffffffff, 0x28323638,

	0, 0, 0, 0x00000e10, 0xffffffff, 0x38404244,

	0, 0, 0, 0x00000e14, 0xffffffff, 0x26303436

	0, 0, 0x00000e08, 0x0000ff00, 0x00003800,

	0, 0, 0x0000086c, 0xffffff00, 0x32343600,

	0, 0, 0x00000e00, 0xffffffff, 0x40424444,

	0, 0, 0x00000e04, 0xffffffff, 0x28323638,

	0, 0, 0x00000e10, 0xffffffff, 0x38404244,

	0, 0, 0x00000e14, 0xffffffff, 0x26303436

};



void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct dm_odm_t *pDM_Odm)
@@ -559,14 +559,13 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG_PG(struct dm_odm_t *pDM_Odm) 
	pDM_Odm->PhyRegPgVersion = 1;

	pDM_Odm->PhyRegPgValueType = PHY_REG_PG_EXACT_VALUE;



	for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_PHY_REG_PG); i += 6) {

	for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_PHY_REG_PG); i += 5) {

		u32 v1 = Array[i];

		u32 v2 = Array[i+1];

		u32 v3 = Array[i+2];

		u32 v4 = Array[i+3];

		u32 v5 = Array[i+4];

		u32 v6 = Array[i+5];



		odm_ConfigBB_PHY_REG_PG_8723B(pDM_Odm, v1, v2, v3, v4, v5, v6);

		odm_ConfigBB_PHY_REG_PG_8723B(pDM_Odm, v1, v2, v3, v4, v5);

	}

}

drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c

+258 −260

File changed.

Preview size limit exceeded, changes collapsed.