From 6b435adbcb2e05e92684bcb1721e7377f91c4825 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Sun, 13 Jul 2014 09:32:03 +0200 Subject: [PATCH] staging: rtl8723au: Eliminate wrapper ODM_ConfigRFWithHeaderFile23a() Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/hal/odm_HWConfig.c | 15 --------------- .../staging/rtl8723au/hal/odm_RegConfig8723A.c | 6 ++---- drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 8 ++------ drivers/staging/rtl8723au/include/odm_HWConfig.h | 4 ---- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/drivers/staging/rtl8723au/hal/odm_HWConfig.c b/drivers/staging/rtl8723au/hal/odm_HWConfig.c index 388654d502d0..4fc0b06c5dbc 100644 --- a/drivers/staging/rtl8723au/hal/odm_HWConfig.c +++ b/drivers/staging/rtl8723au/hal/odm_HWConfig.c @@ -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) { diff --git a/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c b/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c index d076e14f36b9..8f883d933174 100644 --- a/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c +++ b/drivers/staging/rtl8723au/hal/odm_RegConfig8723A.c @@ -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, diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c b/drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c index 6686a298b204..2dc0886e5f90 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c @@ -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; } diff --git a/drivers/staging/rtl8723au/include/odm_HWConfig.h b/drivers/staging/rtl8723au/include/odm_HWConfig.h index 6b98e05d0460..f8236cac9c10 100644 --- a/drivers/staging/rtl8723au/include/odm_HWConfig.h +++ b/drivers/staging/rtl8723au/include/odm_HWConfig.h @@ -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); -- 2.34.1