diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-07-13 09:32:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-13 12:14:32 -0700 |
| commit | 79756e687c52e0cec233906dcc9b57a71c306b3d (patch) | |
| tree | bb327a9d7c674ad8161f38b2e00109638dc3b21a | |
| parent | 7bafabf2d939e72b56591939883a31c31b93a076 (diff) | |
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>
| -rw-r--r-- | drivers/staging/rtl8723au/hal/odm_HWConfig.c | 16 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 10 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/odm.h | 8 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/odm_HWConfig.h | 3 |
4 files changed, 2 insertions, 35 deletions
diff --git a/drivers/staging/rtl8723au/hal/odm_HWConfig.c b/drivers/staging/rtl8723au/hal/odm_HWConfig.c index 4fc0b06c5db..40fea7de7a1 100644 --- a/drivers/staging/rtl8723au/hal/odm_HWConfig.c +++ b/drivers/staging/rtl8723au/hal/odm_HWConfig.c @@ -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) diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c index 8a6ba63151c..7dc2de01610 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c @@ -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: diff --git a/drivers/staging/rtl8723au/include/odm.h b/drivers/staging/rtl8723au/include/odm.h index 183d8ff1ab9..08c6f7297d6 100644 --- a/drivers/staging/rtl8723au/include/odm.h +++ b/drivers/staging/rtl8723au/include/odm.h @@ -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, diff --git a/drivers/staging/rtl8723au/include/odm_HWConfig.h b/drivers/staging/rtl8723au/include/odm_HWConfig.h index f8236cac9c1..6fe6f70de35 100644 --- a/drivers/staging/rtl8723au/include/odm_HWConfig.h +++ b/drivers/staging/rtl8723au/include/odm_HWConfig.h @@ -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 |