From: Jes Sorensen Date: Sun, 13 Jul 2014 07:32:09 +0000 (+0200) Subject: staging: rtl8723au: Remove obfuscating wrapper ODM_ConfigMACWithHeaderFile23a() X-Git-Tag: firefly_0821_release~176^2~3491^2~810 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9464cac7c940e800fc5a2e8696b19febbd8b537c;p=firefly-linux-kernel-4.4.55.git staging: rtl8723au: Remove obfuscating wrapper ODM_ConfigMACWithHeaderFile23a() Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/hal/odm_HWConfig.c b/drivers/staging/rtl8723au/hal/odm_HWConfig.c index b3c711ad0ead..26fbf6c38b99 100644 --- a/drivers/staging/rtl8723au/hal/odm_HWConfig.c +++ b/drivers/staging/rtl8723au/hal/odm_HWConfig.c @@ -413,10 +413,3 @@ void ODM_PhyStatusQuery23a(struct dm_odm_t *pDM_Odm, struct phy_info *pPhyInfo, { ODM_PhyStatusQuery23a_92CSeries(pDM_Odm, pPhyInfo, pPhyStatus, pPktinfo); } - -int ODM_ConfigMACWithHeaderFile23a(struct dm_odm_t *pDM_Odm) -{ - if (pDM_Odm->SupportICType == ODM_RTL8723A) - ODM_ReadAndConfig_MAC_REG_8723A(pDM_Odm); - return _SUCCESS; -} diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c index 7dc2de016108..bd01c10ba874 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c @@ -425,8 +425,7 @@ int PHY_MACConfig8723A(struct rtw_adapter *Adapter) /* */ /* Config MAC */ /* */ - if (ODM_ConfigMACWithHeaderFile23a(&pHalData->odmpriv) == _FAIL) - rtStatus = _FAIL; + ODM_ReadAndConfig_MAC_REG_8723A(&pHalData->odmpriv); /* 2010.07.13 AMPDU aggregation number 9 */ /* rtw_write16(Adapter, REG_MAX_AGGR_NUM, MAX_AGGR_NUM); */ diff --git a/drivers/staging/rtl8723au/include/odm_HWConfig.h b/drivers/staging/rtl8723au/include/odm_HWConfig.h index 2d0fc86a297e..78021a8cf8f9 100644 --- a/drivers/staging/rtl8723au/include/odm_HWConfig.h +++ b/drivers/staging/rtl8723au/include/odm_HWConfig.h @@ -152,6 +152,4 @@ ODM_PhyStatusQuery23a( struct odm_packet_info *pPktinfo ); -int ODM_ConfigMACWithHeaderFile23a(struct dm_odm_t *pDM_Odm); - #endif