openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723au: Remove ugly wrapper ODM_ConfigBBWithHeaderFile23a() 

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-07-13 09:32:07 +02:00 committed by Greg Kroah-Hartman
parent 7bafabf2d9
commit 79756e687c
4 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/rtl8723au/hal/odm_HWConfig.c
View File

@ -423,22 +423,6 @@ void ODM_MacStatusQuery23a(struct dm_odm_t *pDM_Odm, u8 *pMacStatus, u8 MacID,
}
int ODM_ConfigBBWithHeaderFile23a(struct dm_odm_t *pDM_Odm,
enum odm_bb_config_type ConfigType)
{
if (pDM_Odm->SupportICType == ODM_RTL8723A) {
if (ConfigType == CONFIG_BB_PHY_REG)
ODM_ReadAndConfig_PHY_REG_1T_8723A(pDM_Odm);
else if (ConfigType == CONFIG_BB_AGC_TAB)
ODM_ReadAndConfig_AGC_TAB_1T_8723A(pDM_Odm);
ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
(" ===> phy_ConfigBBWithHeaderFile() phy:Rtl8723AGCTAB_1TArray\n"));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_INIT, ODM_DBG_LOUD,
(" ===> phy_ConfigBBWithHeaderFile() agc:Rtl8723PHY_REG_1TArray\n"));
}
return _SUCCESS;
}
int ODM_ConfigMACWithHeaderFile23a(struct dm_odm_t *pDM_Odm)
{
if (pDM_Odm->SupportICType == ODM_RTL8723A)

10
drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
View File

@ -753,11 +753,7 @@ phy_BB8723a_Config_ParaFile(struct rtw_adapter *Adapter)
/* 1. Read PHY_REG.TXT BB INIT!! */
/* We will seperate as 88C / 92C according to chip version */
/* */
if (ODM_ConfigBBWithHeaderFile23a(&pHalData->odmpriv,
CONFIG_BB_PHY_REG) == _FAIL)
rtStatus = _FAIL;
if (rtStatus != _SUCCESS)
goto phy_BB8190_Config_ParaFile_Fail;
ODM_ReadAndConfig_PHY_REG_1T_8723A(&pHalData->odmpriv);
/* */
/* 20100318 Joseph: Config 2T2R to 1T2R if necessary. */
@ -784,9 +780,7 @@ phy_BB8723a_Config_ParaFile(struct rtw_adapter *Adapter)
/* */
/* 3. BB AGC table Initialization */
/* */
if (ODM_ConfigBBWithHeaderFile23a(&pHalData->odmpriv,
CONFIG_BB_AGC_TAB) == _FAIL)
rtStatus = _FAIL;
ODM_ReadAndConfig_AGC_TAB_1T_8723A(&pHalData->odmpriv);
phy_BB8190_Config_ParaFile_Fail:

8
drivers/staging/rtl8723au/include/odm.h
View File

@ -855,14 +855,6 @@ enum odm_rf_content {
odm_radiod_txt = 0x1003
};
enum odm_bb_config_type {
CONFIG_BB_PHY_REG,
CONFIG_BB_AGC_TAB,
CONFIG_BB_AGC_TAB_2G,
CONFIG_BB_AGC_TAB_5G,
CONFIG_BB_PHY_REG_PG,
};
/* Status code */
enum rt_status {
RT_STATUS_SUCCESS,

3
drivers/staging/rtl8723au/include/odm_HWConfig.h
View File

@ -160,9 +160,6 @@ void ODM_MacStatusQuery23a(struct dm_odm_t *pDM_Odm,
bool bPacketBeacon
);
int ODM_ConfigBBWithHeaderFile23a(struct dm_odm_t *pDM_Odm,
enum odm_bb_config_type ConfigType);
int ODM_ConfigMACWithHeaderFile23a(struct dm_odm_t *pDM_Odm);
#endif