Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b435adb authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Eliminate wrapper ODM_ConfigRFWithHeaderFile23a() 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8950425

drivers/staging/rtl8723au/hal/odm_HWConfig.c

+0 −15
Original line number Diff line number Diff line
@@ -423,21 +423,6 @@ void ODM_MacStatusQuery23a(struct dm_odm_t *pDM_Odm, u8 *pMacStatus, u8 MacID, 


}



int ODM_ConfigRFWithHeaderFile23a(struct dm_odm_t *pDM_Odm,

				  enum RF_RADIO_PATH Content,

				  enum RF_RADIO_PATH eRFPath)

{

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,

		     ("===>ODM_ConfigRFWithHeaderFile23a\n"));

	if (pDM_Odm->SupportICType == ODM_RTL8723A) {

		if (eRFPath == RF_PATH_A)

			ODM_ReadAndConfig_RadioA_1T_8723A(pDM_Odm);

	}

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_TRACE,

		     ("ODM_ConfigRFWithHeaderFile23a: Radio No %x\n", eRFPath));

	return _SUCCESS;

}



int ODM_ConfigBBWithHeaderFile23a(struct dm_odm_t *pDM_Odm,

				  enum odm_bb_config_type ConfigType)

{

drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c

+2 −4
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ void odm_ConfigRF_RadioA_8723A(struct dm_odm_t *pDM_Odm, 
	odm_ConfigRFReg_8723A(pDM_Odm, Addr, Data, RF_PATH_A,

			      Addr|maskforPhySet);

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,

		     ("===> ODM_ConfigRFWithHeaderFile23a: [RadioA] %08X %08X\n",

		     Addr, Data));

		     ("===> %s: [RadioA] %08X %08X\n", __func__, Addr, Data));

}



void odm_ConfigRF_RadioB_8723A(struct dm_odm_t *pDM_Odm,
@@ -69,8 +68,7 @@ void odm_ConfigRF_RadioB_8723A(struct dm_odm_t *pDM_Odm, 
	odm_ConfigRFReg_8723A(pDM_Odm, Addr, Data, RF_PATH_B,

			      Addr|maskforPhySet);

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,

		     ("===> ODM_ConfigRFWithHeaderFile23a: [RadioB] %08X %08X\n",

		     Addr, Data));

		     ("===> %s: [RadioB] %08X %08X\n", __func__, Addr, Data));

}



void odm_ConfigMAC_8723A(struct dm_odm_t *pDM_Odm,

drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c

+2 −6
Original line number Diff line number Diff line
@@ -455,13 +455,9 @@ static int phy_RF6052_Config_ParaFile(struct rtw_adapter *Adapter) 
		/*----Initialize RF fom connfiguration file----*/

		switch (eRFPath) {

		case RF_PATH_A:

			ODM_ReadAndConfig_RadioA_1T_8723A(&pHalData->odmpriv);

			break;

		case RF_PATH_B:

			if (ODM_ConfigRFWithHeaderFile23a(&pHalData->odmpriv,

							  (enum RF_RADIO_PATH)

							  eRFPath,

							  (enum RF_RADIO_PATH)

							  eRFPath) == _FAIL)

				rtStatus = _FAIL;

			break;

		}

drivers/staging/rtl8723au/include/odm_HWConfig.h

+0 −4
Original line number Diff line number Diff line
@@ -160,10 +160,6 @@ void ODM_MacStatusQuery23a(struct dm_odm_t *pDM_Odm, 
	bool bPacketBeacon

);



int ODM_ConfigRFWithHeaderFile23a(struct dm_odm_t *pDM_Odm,

				  enum RF_RADIO_PATH Content,

				  enum RF_RADIO_PATH eRFPath);



int ODM_ConfigBBWithHeaderFile23a(struct dm_odm_t *pDM_Odm,

				  enum odm_bb_config_type ConfigType);