summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2014-07-13 09:32:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 12:14:32 -0700
commit9464cac7c940e800fc5a2e8696b19febbd8b537c (patch)
tree46f156b10bdd3975369c8e17fe9c7fcb441e1bd0
parentf467c2b214928132980a2d850741407cd59af502 (diff)
staging: rtl8723au: Remove obfuscating wrapper ODM_ConfigMACWithHeaderFile23a()
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.c7
-rw-r--r--drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c3
-rw-r--r--drivers/staging/rtl8723au/include/odm_HWConfig.h2
3 files changed, 1 insertions, 11 deletions
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